[llvm-commits] [llvm] r110541 - in /llvm/trunk: lib/VMCore/Verifier.cpp test/Verifier/2010-08-07-PointerIntrinsic.ll

[Nick Lewycky]

Author: nicholas
Date: Sun Aug  8 01:12:09 2010
New Revision: 110541

URL: http://llvm.org/viewvc/llvm-project?rev=110541&view=rev
Log:
Reject unrepresentable pointer types in intrinsics. Fixes PR7316.

Added:
    llvm/trunk/test/Verifier/2010-08-07-PointerIntrinsic.ll
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=110541&r1=110540&r2=110541&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/Verifier.cpp (original)
+++ llvm/trunk/lib/VMCore/Verifier.cpp Sun Aug  8 01:12:09 2010
@@ -1840,8 +1840,13 @@
     // and iPTR. In the verifier, we can not distinguish which case we have so
     // allow either case to be legal.
     if (const PointerType* PTyp = dyn_cast<PointerType>(Ty)) {
-      Suffix += ".p" + utostr(PTyp->getAddressSpace()) + 
-        EVT::getEVT(PTyp->getElementType()).getEVTString();
+      EVT PointeeVT = EVT::getEVT(PTyp->getElementType(), true);
+      if (PointeeVT == MVT::Other) {
+        CheckFailed("Intrinsic has pointer to complex type.");
+        return false;
+      }
+      Suffix += ".p" + utostr(PTyp->getAddressSpace()) +
+        PointeeVT.getEVTString();
     } else {
       CheckFailed(IntrinsicParam(ArgNo, NumRetVals) + " is not a "
                   "pointer and a pointer is required.", F);

Added: llvm/trunk/test/Verifier/2010-08-07-PointerIntrinsic.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/2010-08-07-PointerIntrinsic.ll?rev=110541&view=auto
==============================================================================
--- llvm/trunk/test/Verifier/2010-08-07-PointerIntrinsic.ll (added)
+++ llvm/trunk/test/Verifier/2010-08-07-PointerIntrinsic.ll Sun Aug  8 01:12:09 2010
@@ -0,0 +1,21 @@
+; RUN: not llvm-as < %s 2> %t
+; RUN: grep {Broken module} %t
+; PR7316
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:32"
+target triple = "x86-unknown-unknown"
+ at aa = global [32 x i8] zeroinitializer, align 1
+ at bb = global [16 x i8] zeroinitializer, align 1
+define void @x() nounwind {
+L.0:
+	%0 = getelementptr [32 x i8]* @aa, i32 0, i32 4
+	%1 = bitcast i8* %0 to [16 x i8]*
+	%2 = bitcast [16 x i8]* %1 to [0 x i8]*
+	%3 = getelementptr [16 x i8]* @bb
+	%4 = bitcast [16 x i8]* %3 to [0 x i8]*
+	call void @llvm.memcpy.i32([0 x i8]* %2, [0 x i8]* %4, i32 16, i32 1)
+	br label %return
+return:
+	ret void
+}
+declare void @llvm.memcpy.i32([0 x i8]*, [0 x i8]*, i32, i32) nounwind