[llvm-commits] [llvm] r55233 - /llvm/trunk/lib/VMCore/Verifier.cpp

[Bill Wendling]

Author: void
Date: Sat Aug 23 04:46:46 2008
New Revision: 55233

URL: http://llvm.org/viewvc/llvm-project?rev=55233&view=rev
Log:
Reverting r55227. This was causing the following failures in the regression
tests:

Running /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.HEAD.src/test/Verifier/dg.exp ...
FAIL: /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.HEAD.src/test/Verifier/gcread-ptrptr.ll for PR1633
Failed with exit(1) at line 1
while running: not llvm-as < /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.HEAD.src/test/Verifier/gcread-ptrptr.ll >& /dev/null
child process exited abnormally
FAIL: /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.HEAD.src/test/Verifier/gcroot-alloca.ll for PR1633
Failed with exit(1) at line 1
while running: not llvm-as < /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.HEAD.src/test/Verifier/gcroot-alloca.ll >& /dev/null
child process exited abnormally
FAIL: /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.HEAD.src/test/Verifier/gcroot-meta.ll for PR1633
Failed with exit(1) at line 1
while running: not llvm-as < /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.HEAD.src/test/Verifier/gcroot-meta.ll >& /dev/null
child process exited abnormally
FAIL: ndbox/Buildbot/llvm/full-llvm/build/llvm.HEAD.src/test/Verifier/gcroot-ptrptr.ll for PR1633
Failed with exit(1) at line 1
while running: not llvm-as < /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.HEAD.src/test/Verifier/gcroot-ptrptr.ll >& /dev/null
child process exited abnormally
FAIL: /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.HEAD.src/test/Verifier/gcwrite-ptrptr.ll for PR1633
Failed with exit(1) at line 1
while running: not llvm-as < /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.HEAD.src/test/Verifier/gcwrite-ptrptr.ll >& /dev/null
child process exited abnormally

		===  Summary ===

# of expected passes		3021
# of unexpected failures	6
# of expected failures		16
make[1]: *** [check-local] Error 1
make: *** [check] Error 2


Modified:
    llvm/trunk/lib/VMCore/Verifier.cpp

Modified: llvm/trunk/lib/VMCore/Verifier.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Verifier.cpp?rev=55233&r1=55232&r2=55233&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/Verifier.cpp (original)
+++ llvm/trunk/lib/VMCore/Verifier.cpp Sat Aug 23 04:46:46 2008
@@ -1283,6 +1283,45 @@
             "alignment argument of memory intrinsics must be a constant int",
             &CI);
     break;
+  case Intrinsic::gcroot:
+  case Intrinsic::gcwrite:
+  case Intrinsic::gcread: {
+      Type *PtrTy    = PointerType::getUnqual(Type::Int8Ty),
+           *PtrPtrTy = PointerType::getUnqual(PtrTy);
+      
+      switch (ID) {
+      default:
+        break;
+      case Intrinsic::gcroot:
+        Assert1(CI.getOperand(1)->getType() == PtrPtrTy,
+                "Intrinsic parameter #1 is not i8**.", &CI);
+        Assert1(CI.getOperand(2)->getType() == PtrTy,
+                "Intrinsic parameter #2 is not i8*.", &CI);
+        Assert1(isa<AllocaInst>(CI.getOperand(1)->stripPointerCasts()),
+                "llvm.gcroot parameter #1 must be an alloca.", &CI);
+        Assert1(isa<Constant>(CI.getOperand(2)),
+                "llvm.gcroot parameter #2 must be a constant.", &CI);
+        break;
+      case Intrinsic::gcwrite:
+        Assert1(CI.getOperand(1)->getType() == PtrTy,
+                "Intrinsic parameter #1 is not a i8*.", &CI);
+        Assert1(CI.getOperand(2)->getType() == PtrTy,
+                "Intrinsic parameter #2 is not a i8*.", &CI);
+        Assert1(CI.getOperand(3)->getType() == PtrPtrTy,
+                "Intrinsic parameter #3 is not a i8**.", &CI);
+        break;
+      case Intrinsic::gcread:
+        Assert1(CI.getOperand(1)->getType() == PtrTy,
+                "Intrinsic parameter #1 is not a i8*.", &CI);
+        Assert1(CI.getOperand(2)->getType() == PtrPtrTy,
+                "Intrinsic parameter #2 is not a i8**.", &CI);
+        break;
+      }
+      
+      Assert1(CI.getParent()->getParent()->hasGC(),
+              "Enclosing function does not use GC.",
+              &CI);
+    } break;
   case Intrinsic::init_trampoline:
     Assert1(isa<Function>(CI.getOperand(2)->stripPointerCasts()),
             "llvm.init_trampoline parameter #2 must resolve to a function.",