Index: test/tools/llvm-diff/constantvector.ll =================================================================== --- test/tools/llvm-diff/constantvector.ll +++ test/tools/llvm-diff/constantvector.ll @@ -0,0 +1,16 @@ +; Bugzilla: https://bugs.llvm.org/show_bug.cgi?id=33623 +; RUN: llvm-diff %s %s + +%struct.it = type { i64, i64* } + +@a_vector = internal global [2 x i64] zeroinitializer, align 16 + +define i32 @foo(%struct.it* %it) { + +entry: + %a = getelementptr inbounds %struct.it, %struct.it* %it, i64 0, i32 1 + %tmp0 = bitcast i64** %a to <2 x i64*>* + store <2 x i64*> , <2 x i64*>* %tmp0, align 8 + + ret i32 0 +} Index: test/tools/llvm-diff/indirectbr.ll =================================================================== --- test/tools/llvm-diff/indirectbr.ll +++ test/tools/llvm-diff/indirectbr.ll @@ -0,0 +1,11 @@ +; Bugzilla: https://bugs.llvm.org/show_bug.cgi?id=33623 +; RUN: llvm-diff %s %s + +define i32 @foo(i8*) { +entry: + indirectbr i8* %0, [label %A, label %B, label %entry] +A: + ret i32 1 +B: + ret i32 2 +} Index: test/tools/llvm-diff/undef.ll =================================================================== --- test/tools/llvm-diff/undef.ll +++ test/tools/llvm-diff/undef.ll @@ -0,0 +1,11 @@ +; Bugzilla: https://bugs.llvm.org/show_bug.cgi?id=33623 +; RUN: llvm-diff %s %s + +%A = type { i64, i64 } +@_gm_ = global <2 x %A*> zeroinitializer + +define void @f() { +entry: + store <2 x %A*> undef, <2 x %A*>* @_gm_ + ret void +} Index: test/tools/llvm-diff/zeroinitializer.bc.ll =================================================================== --- test/tools/llvm-diff/zeroinitializer.bc.ll +++ test/tools/llvm-diff/zeroinitializer.bc.ll @@ -0,0 +1,11 @@ +; Bugzilla: https://bugs.llvm.org/show_bug.cgi?id=33623 +; RUN: llvm-diff %s %s + +%A = type { i64, i64 } +@_gm_ = global <2 x %A*> zeroinitializer + +define void @f() { +entry: + store <2 x %A*> zeroinitializer, <2 x %A*>* @_gm_ + ret void +} Index: tools/llvm-diff/DifferenceEngine.cpp =================================================================== --- tools/llvm-diff/DifferenceEngine.cpp +++ tools/llvm-diff/DifferenceEngine.cpp @@ -303,6 +303,26 @@ if (TryUnify) tryUnify(LI->getSuccessor(0), RI->getSuccessor(0)); return false; + } else if (isa(L)) { + IndirectBrInst *LI = cast(L); + IndirectBrInst *RI = cast(R); + if (LI->getNumDestinations() != RI->getNumDestinations()) { + if (Complain) Engine.log("indirectbr # of destinations differ"); + return true; + } + + if (!equivalentAsOperands(LI->getAddress(), RI->getAddress())) { + if (Complain) Engine.log("indirectbr addresses differ"); + return true; + } + + if (TryUnify) { + for (unsigned i = 0; i < LI->getNumDestinations(); i++) { + tryUnify(LI->getDestination(i), RI->getDestination(i)); + } + } + return false; + } else if (isa(L)) { SwitchInst *LI = cast(L); SwitchInst *RI = cast(R); @@ -377,9 +397,9 @@ return equivalentAsOperands(cast(L), cast(R)); - // Nulls of the "same type" don't always actually have the same + // Constants of the "same type" don't always actually have the same // type; I don't know why. Just white-list them. - if (isa(L)) + if (isa(L) || isa(L) || isa(L)) return true; // Block addresses only match if we've already encountered the @@ -388,6 +408,19 @@ return Blocks[cast(L)->getBasicBlock()] == cast(R)->getBasicBlock(); + // If L and R are ConstantVectors, compare each element + if (isa(L)) { + ConstantVector *CVL = cast(L); + ConstantVector *CVR = cast(R); + if (CVL->getType()->getNumElements() != CVR->getType()->getNumElements()) + return false; + for (unsigned i = 0; i < CVL->getType()->getNumElements(); i++) { + if (!equivalentAsOperands(CVL->getOperand(i), CVR->getOperand(i))) + return false; + } + return true; + } + return false; }