diff options
| -rw-r--r-- | Driver/ASTConsumers.h | 2 | ||||
| -rw-r--r-- | Driver/RewriteTest.cpp | 12 | ||||
| -rw-r--r-- | Driver/clang.cpp | 2 | ||||
| -rw-r--r-- | clang.xcodeproj/project.pbxproj | 1 |
4 files changed, 12 insertions, 5 deletions
diff --git a/Driver/ASTConsumers.h b/Driver/ASTConsumers.h index dc6e750b72..37f825b5da 100644 --- a/Driver/ASTConsumers.h +++ b/Driver/ASTConsumers.h @@ -30,7 +30,7 @@ ASTConsumer *CreateLiveVarAnalyzer(); ASTConsumer *CreateDeadStoreChecker(Diagnostic &Diags); ASTConsumer *CreateUnitValsChecker(Diagnostic &Diags); ASTConsumer *CreateLLVMEmitter(Diagnostic &Diags, const LangOptions &Features); -ASTConsumer *CreateCodeRewriterTest(); +ASTConsumer *CreateCodeRewriterTest(Diagnostic &Diags); ASTConsumer *CreateSerializationTest(); } // end clang namespace diff --git a/Driver/RewriteTest.cpp b/Driver/RewriteTest.cpp index 043b260b16..5d14f03555 100644 --- a/Driver/RewriteTest.cpp +++ b/Driver/RewriteTest.cpp @@ -27,6 +27,7 @@ using llvm::utostr; namespace { class RewriteTest : public ASTConsumer { Rewriter Rewrite; + Diagnostic &Diags; ASTContext *Context; SourceManager *SM; unsigned MainFileID; @@ -92,6 +93,7 @@ namespace { // Top Level Driver code. virtual void HandleTopLevelDecl(Decl *D); void HandleDeclInMainFile(Decl *D); + RewriteTest(Diagnostic &D) : Diags(D) {} ~RewriteTest(); // Syntactic Rewriting. @@ -160,7 +162,9 @@ namespace { }; } -ASTConsumer *clang::CreateCodeRewriterTest() { return new RewriteTest(); } +ASTConsumer *clang::CreateCodeRewriterTest(Diagnostic &Diags) { + return new RewriteTest(Diags); +} //===----------------------------------------------------------------------===// // Top Level Driver Code @@ -860,7 +864,11 @@ Stmt *RewriteTest::RewriteAtEncode(ObjCEncodeExpr *Exp) { Expr *Replacement = new StringLiteral(StrEncoding.c_str(), StrEncoding.length(), false, StrType, SourceLocation(), SourceLocation()); - Rewrite.ReplaceStmt(Exp, Replacement); + if (Rewrite.ReplaceStmt(Exp, Replacement)) { + // replacement failed. + return Exp; + } + delete Exp; return Replacement; } diff --git a/Driver/clang.cpp b/Driver/clang.cpp index ac3a04ab2e..f26fb994b9 100644 --- a/Driver/clang.cpp +++ b/Driver/clang.cpp @@ -836,7 +836,7 @@ static void ProcessInputFile(Preprocessor &PP, unsigned MainFileID, break; case RewriteTest: - Consumer = CreateCodeRewriterTest(); + Consumer = CreateCodeRewriterTest(PP.getDiagnostics()); break; } diff --git a/clang.xcodeproj/project.pbxproj b/clang.xcodeproj/project.pbxproj index 1585d851d9..db10ad3f44 100644 --- a/clang.xcodeproj/project.pbxproj +++ b/clang.xcodeproj/project.pbxproj @@ -766,7 +766,6 @@ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "clang" */; - compatibilityVersion = "Xcode 2.4"; hasScannedForEncodings = 1; mainGroup = 08FB7794FE84155DC02AAC07 /* clang */; projectDirPath = ""; |