Fix a typo that prevented pointer-to-int conversions from working.

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

CodeGen/CGExprScalar.cpp

@@ -334,7 +334,7 @@ Value *ScalarExprEmitter::EmitScalarConversion(Value *Src, QualType SrcType,
   if (isa<PointerType>(SrcType)) {
     // Must be an ptr to int cast.
     assert(isa<llvm::IntegerType>(DstTy) && "not ptr->int?");
-    return Builder.CreateIntToPtr(Src, DstTy, "conv");
+    return Builder.CreatePtrToInt(Src, DstTy, "conv");
   }
   
   // Finally, we have the arithmetic types: real int/float.

test/CodeGen/pointer-to-int.c

@@ -0,0 +1,6 @@
+// RUN: clang -emit-llvm %s
+
+int test(void* i)
+{
+  return (int)i;
+}