diff options
| -rw-r--r-- | llvm/lib/Bitcode/Writer/ValueEnumerator.cpp | 7 | ||||
| -rw-r--r-- | llvm/test/Bitcode/miscInstructions.3.2.ll | 1 | ||||
| -rw-r--r-- | llvm/test/Bitcode/ssse3_palignr.ll | 1 | ||||
| -rw-r--r-- | llvm/test/Bitcode/use-list-order.ll | 11 | ||||
| -rw-r--r-- | llvm/test/Bitcode/variableArgumentIntrinsic.3.2.ll | 1 |
5 files changed, 17 insertions, 4 deletions
diff --git a/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp b/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp index c05d6ae0d21..fa1c8b3c57d 100644 --- a/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp +++ b/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp @@ -211,9 +211,9 @@ static void predictValueUseListOrder(const Value *V, const Function *F, // Recursive descent into constants. if (const Constant *C = dyn_cast<Constant>(V)) - if (C->getNumOperands() && !isa<GlobalValue>(C)) + if (C->getNumOperands()) // Visit GlobalValues. for (const Value *Op : C->operands()) - if (isa<Constant>(Op) && !isa<GlobalValue>(Op)) + if (isa<Constant>(Op)) // Visit GlobalValues. predictValueUseListOrder(Op, F, OM, Stack); } @@ -241,8 +241,7 @@ static UseListOrderStack predictUseListOrder(const Module *M) { for (const BasicBlock &BB : F) for (const Instruction &I : BB) for (const Value *Op : I.operands()) - if ((isa<Constant>(*Op) && !isa<GlobalValue>(*Op)) || - isa<InlineAsm>(*Op)) + if (isa<Constant>(*Op) || isa<InlineAsm>(*Op)) // Visit GlobalValues. predictValueUseListOrder(Op, &F, OM, Stack); for (const BasicBlock &BB : F) for (const Instruction &I : BB) diff --git a/llvm/test/Bitcode/miscInstructions.3.2.ll b/llvm/test/Bitcode/miscInstructions.3.2.ll index 2b44fc6599e..ccef8dff67c 100644 --- a/llvm/test/Bitcode/miscInstructions.3.2.ll +++ b/llvm/test/Bitcode/miscInstructions.3.2.ll @@ -1,4 +1,5 @@ ; RUN: llvm-dis < %s.bc| FileCheck %s +; RUN: verify-uselistorder < %s.bc -preserve-bc-use-list-order -num-shuffles=5 ; miscInstructions.3.2.ll.bc was generated by passing this file to llvm-as-3.2. ; The test checks that LLVM does not misread miscellaneous instructions of diff --git a/llvm/test/Bitcode/ssse3_palignr.ll b/llvm/test/Bitcode/ssse3_palignr.ll index 90b4394a8b4..4a612ec546d 100644 --- a/llvm/test/Bitcode/ssse3_palignr.ll +++ b/llvm/test/Bitcode/ssse3_palignr.ll @@ -1,4 +1,5 @@ ; RUN: opt < %s -S | FileCheck %s +; RUN: verify-uselistorder < %s -preserve-bc-use-list-order -num-shuffles=5 ; CHECK-NOT: {@llvm\\.palign} define <4 x i32> @align1(<4 x i32> %a, <4 x i32> %b) nounwind readnone ssp { diff --git a/llvm/test/Bitcode/use-list-order.ll b/llvm/test/Bitcode/use-list-order.ll index bb71a8586b7..fb18b462da5 100644 --- a/llvm/test/Bitcode/use-list-order.ll +++ b/llvm/test/Bitcode/use-list-order.ll @@ -17,6 +17,11 @@ @var2 = global i3* @target @var3 = global i3* @target +; Check use-list order for a global when used both by a global and in a +; function. +@globalAndFunction = global i4 4 +@globalAndFunctionGlobalUser = global i4* @globalAndFunction + define i64 @f(i64 %f) { entry: %sum = add i64 %f, 0 @@ -94,3 +99,9 @@ first: %gotosecond = icmp slt i32 %gh, -9 br i1 %gotosecond, label %second, label %exit } + +define i4 @globalAndFunctionFunctionUser() { +entry: + %local = load i4* @globalAndFunction + ret i4 %local +} diff --git a/llvm/test/Bitcode/variableArgumentIntrinsic.3.2.ll b/llvm/test/Bitcode/variableArgumentIntrinsic.3.2.ll index 199fbbdbdb5..14914b78b42 100644 --- a/llvm/test/Bitcode/variableArgumentIntrinsic.3.2.ll +++ b/llvm/test/Bitcode/variableArgumentIntrinsic.3.2.ll @@ -1,4 +1,5 @@ ; RUN: llvm-dis < %s.bc| FileCheck %s +; RUN: verify-uselistorder < %s.bc -preserve-bc-use-list-order -num-shuffles=5 ; vaArgIntrinsic.3.2.ll.bc was generated by passing this file to llvm-as-3.2. ; The test checks that LLVM does not misread variable argument intrinsic instructions |
