diff options
| -rw-r--r-- | CodeGen/CGExpr.cpp | 2 | ||||
| -rw-r--r-- | clang.xcodeproj/project.pbxproj | 2 | ||||
| -rw-r--r-- | test/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/CodeGen/CGExpr.cpp b/CodeGen/CGExpr.cpp index 51ad770dca..ff55e96086 100644 --- a/CodeGen/CGExpr.cpp +++ b/CodeGen/CGExpr.cpp @@ -97,7 +97,7 @@ RValue CodeGenFunction::EmitConversion(RValue Val, QualType ValTy, if (isa<llvm::PointerType>(Val.getVal()->getType())) return RValue::get(Builder.CreateBitCast(Val.getVal(), DestTy, "conv")); assert(ValTy->isIntegerType() && "Not ptr->ptr or int->ptr conversion?"); - return RValue::get(Builder.CreatePtrToInt(Val.getVal(), DestTy, "conv")); + return RValue::get(Builder.CreateIntToPtr(Val.getVal(), DestTy, "conv")); } if (isa<PointerType>(ValTy)) { diff --git a/clang.xcodeproj/project.pbxproj b/clang.xcodeproj/project.pbxproj index 6059d2ac79..560076196a 100644 --- a/clang.xcodeproj/project.pbxproj +++ b/clang.xcodeproj/project.pbxproj @@ -189,7 +189,7 @@ 1A869AA70BA21ABA008DA07A /* LiteralSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = LiteralSupport.cpp; sourceTree = "<group>"; }; 84D9A8870C1A57E100AC7ABC /* AttributeList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = AttributeList.cpp; path = Parse/AttributeList.cpp; sourceTree = "<group>"; }; 84D9A88B0C1A581300AC7ABC /* AttributeList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AttributeList.h; path = clang/Parse/AttributeList.h; sourceTree = "<group>"; }; - 8DD76F6C0486A84900D96B5E /* clang */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = clang; sourceTree = BUILT_PRODUCTS_DIR; }; + 8DD76F6C0486A84900D96B5E /* clang */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = clang; sourceTree = BUILT_PRODUCTS_DIR; }; DE01DA480B12ADA300AC22CE /* PPCallbacks.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PPCallbacks.h; sourceTree = "<group>"; }; DE06756B0C051CFE00EBBFD8 /* ParseExprCXX.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ParseExprCXX.cpp; path = Parse/ParseExprCXX.cpp; sourceTree = "<group>"; }; DE06B73D0A8307640050E87E /* LangOptions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = LangOptions.h; sourceTree = "<group>"; }; diff --git a/test/Makefile b/test/Makefile index c92a14fc8d..4a2907b44c 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,3 +1,3 @@ all: - find Lexer Preprocessor Parser \( -name '*.c' -or -name '*.cpp' \) -print -exec ./TestRunner.sh {} \; + find CodeGen Lexer Preprocessor Parser \( -name '*.c' -or -name '*.cpp' \) -print -exec ./TestRunner.sh {} \; |