Revert the change from r51157 in

test/Verifier/2002-11-05-GetelementptrPointers.ll, which was incorrect.
Instead, fix getIndexedType to not follow pointer types, as
PointerType is a subclass of CompositeType.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@51171 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/VMCore/Instructions.cpp b/lib/VMCore/Instructions.cpp
index c54815aaacf2a1196076a58f71c954e9f6561e5a..9fc70ce59b1a14e752fe8ba3b3405ebfa3a4c8d4 100644 (file)
--- a/lib/VMCore/Instructions.cpp
+++ b/lib/VMCore/Instructions.cpp
@@ -1336,7 +1336,7 @@ const Type* ExtractValueInst::getIndexedType(const Type *Agg,
   unsigned CurIdx = 0;
   for (; CurIdx != NumIdx; ++CurIdx) {
     const CompositeType *CT = dyn_cast<CompositeType>(Agg);
-    if (!CT) return 0;
+    if (!CT || isa<PointerType>(CT)) return 0;
     Value *Index = Idxs[CurIdx];
     if (!CT->indexValid(Index)) return 0;
     Agg = CT->getTypeAtIndex(Index);

diff --git a/test/Verifier/2002-11-05-GetelementptrPointers.ll b/test/Verifier/2002-11-05-GetelementptrPointers.ll
index c762b2a353096a4e67863b92b82ac948c2bf42ba..e37a0ffd324953fcf409ad7e3093ae242b1cbc38 100644 (file)
--- a/test/Verifier/2002-11-05-GetelementptrPointers.ll
+++ b/test/Verifier/2002-11-05-GetelementptrPointers.ll
@@ -1,7 +1,7 @@
-; RUN: llvm-as < %s
+; RUN: not llvm-as < %s |& grep {Invalid getelementptr indices}
 
-; This testcase was previously considered invalid for indexing into a pointer
-; that is contained WITHIN a structure, but this is now valid.
+; This testcase is invalid because we are indexing into a pointer that is 
+; contained WITHIN a structure.
 
 define void @test({i32, i32*} * %X) {
        getelementptr {i32, i32*} * %X, i32 0, i32 1, i32 0