[TBAA] Fix handling of mixed TBAA (path-aware and non-path-aware TBAA).
This fix simply ensures that both metadata nodes are path-aware before
performing path-aware alias analysis.
This issue isn't normally triggered in LLVM, because we perform an autoupgrade
of the TBAA metadata to the new format when reading in LL or BC files. This
issue only appears when a client creates the IR manually and mixes old and new
TBAA metadata format.
This fixes <rdar://problem/16760860>.
llvm-svn: 207923
diff --git a/llvm/unittests/Analysis/CMakeLists.txt b/llvm/unittests/Analysis/CMakeLists.txt
index 5cca8e8..8454860 100644
--- a/llvm/unittests/Analysis/CMakeLists.txt
+++ b/llvm/unittests/Analysis/CMakeLists.txt
@@ -9,4 +9,5 @@
CFGTest.cpp
LazyCallGraphTest.cpp
ScalarEvolutionTest.cpp
+ MixedTBAATest.cpp
)
diff --git a/llvm/unittests/Analysis/MixedTBAATest.cpp b/llvm/unittests/Analysis/MixedTBAATest.cpp
new file mode 100644
index 0000000..2cf7c73
--- /dev/null
+++ b/llvm/unittests/Analysis/MixedTBAATest.cpp
@@ -0,0 +1,77 @@
+//===--- MixedTBAATest.cpp - Mixed TBAA unit tests ------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/Analysis/Passes.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/LLVMContext.h"
+#include "llvm/IR/MDBuilder.h"
+#include "llvm/IR/Module.h"
+#include "llvm/PassManager.h"
+#include "llvm/Support/CommandLine.h"
+#include "gtest/gtest.h"
+
+namespace llvm {
+namespace {
+
+class MixedTBAATest : public testing::Test {
+protected:
+ MixedTBAATest() : M("MixedTBAATest", C), MD(C) {}
+
+ LLVMContext C;
+ Module M;
+ MDBuilder MD;
+ PassManager PM;
+};
+
+TEST_F(MixedTBAATest, MixedTBAA) {
+ // Setup function.
+ FunctionType *FTy = FunctionType::get(Type::getVoidTy(C),
+ std::vector<Type *>(), false);
+ auto *F = cast<Function>(M.getOrInsertFunction("f", FTy));
+ auto *BB = BasicBlock::Create(C, "entry", F);
+ auto IntType = Type::getInt32Ty(C);
+ auto PtrType = Type::getInt32PtrTy(C);
+ auto *Value = ConstantInt::get(IntType, 42);
+ auto *Addr = ConstantPointerNull::get(PtrType);
+
+ auto *Store1 = new StoreInst(Value, Addr, BB);
+ auto *Store2 = new StoreInst(Value, Addr, BB);
+ ReturnInst::Create(C, 0, BB);
+
+ // New TBAA metadata
+ {
+ auto RootMD = MD.createTBAARoot("Simple C/C++ TBAA");
+ auto MD1 = MD.createTBAAScalarTypeNode("omnipotent char", RootMD);
+ auto MD2 = MD.createTBAAScalarTypeNode("int", MD1);
+ auto MD3 = MD.createTBAAStructTagNode(MD2, MD2, 0);
+ Store2->setMetadata(LLVMContext::MD_tbaa, MD3);
+ }
+
+ // Old TBAA metadata
+ {
+ auto RootMD = MD.createTBAARoot("Simple C/C++ TBAA");
+ auto MD1 = MD.createTBAANode("omnipotent char", RootMD);
+ auto MD2 = MD.createTBAANode("int", MD1);
+ Store1->setMetadata(LLVMContext::MD_tbaa, MD2);
+ }
+
+ // Run the TBAA eval pass on a mixture of path-aware and non-path-aware TBAA.
+ // The order of the metadata (path-aware vs non-path-aware) is important,
+ // because the AA eval pass only runs one test per store-pair.
+ const char* args[] = { "MixedTBAATest", "-evaluate-tbaa" };
+ cl::ParseCommandLineOptions(sizeof(args) / sizeof(const char*), args);
+ PM.add(createTypeBasedAliasAnalysisPass());
+ PM.add(createAAEvalPass());
+ PM.run(M);
+}
+
+} // end anonymous namspace
+} // end llvm namespace
+