[llvm-branch-commits] [cfe-branch] r150470 - in /cfe/branches/tooling: ./ clang.xcodeproj/ lib/Rewrite/ lib/Sema/ lib/StaticAnalyzer/Checkers/ test/AST/ test/Analysis/ test/CXX/dcl.dcl/ test/CXX/expr/expr.const/ test/CXX/expr/expr.prim/expr.prim.lambda/ test/CodeGen/ test/CodeGenCXX/ test/CodeGenObjC/ test/Driver/prefixed-tools.c-helper/ test/Index/ test/Lexer/Inputs/ test/PCH/ test/Rewriter/ test/SemaCXX/ test/SemaTemplate/ test/Tooling/ utils/ www/analyzer/downloads/
Manuel Klimek
klimek at google.com
Tue Feb 14 02:19:43 PST 2012
Author: klimek
Date: Tue Feb 14 04:19:43 2012
New Revision: 150470
URL: http://llvm.org/viewvc/llvm-project?rev=150470&view=rev
Log:
Fixing broken merge of mainline.
Added:
cfe/branches/tooling/clang.xcodeproj/ (props changed)
- copied from r150464, cfe/branches/tooling/clang.xcodeproj/
cfe/branches/tooling/lib/Rewrite/RewriteModernObjC.cpp
- copied unchanged from r150469, cfe/trunk/lib/Rewrite/RewriteModernObjC.cpp
cfe/branches/tooling/lib/Sema/SemaLambda.cpp
- copied unchanged from r150469, cfe/trunk/lib/Sema/SemaLambda.cpp
cfe/branches/tooling/lib/StaticAnalyzer/Checkers/BoolAssignmentChecker.cpp
- copied unchanged from r150469, cfe/trunk/lib/StaticAnalyzer/Checkers/BoolAssignmentChecker.cpp
cfe/branches/tooling/test/AST/
- copied from r150464, cfe/branches/tooling/test/AST/
cfe/branches/tooling/test/Analysis/bool-assignment.cpp
- copied unchanged from r150469, cfe/trunk/test/Analysis/bool-assignment.cpp
cfe/branches/tooling/test/Analysis/bool-assignment2.c
- copied unchanged from r150469, cfe/trunk/test/Analysis/bool-assignment2.c
cfe/branches/tooling/test/Analysis/inline-not-supported.c
- copied unchanged from r150469, cfe/trunk/test/Analysis/inline-not-supported.c
cfe/branches/tooling/test/Analysis/malloc-annotations.c
- copied unchanged from r150469, cfe/trunk/test/Analysis/malloc-annotations.c
cfe/branches/tooling/test/CXX/dcl.dcl/p4-0x.cpp
- copied unchanged from r150469, cfe/trunk/test/CXX/dcl.dcl/p4-0x.cpp
cfe/branches/tooling/test/CXX/expr/expr.const/p5-0x.cpp
- copied unchanged from r150469, cfe/trunk/test/CXX/expr/expr.const/p5-0x.cpp
cfe/branches/tooling/test/CXX/expr/expr.prim/expr.prim.lambda/p11.cpp
- copied unchanged from r150469, cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/p11.cpp
cfe/branches/tooling/test/CXX/expr/expr.prim/expr.prim.lambda/p12.cpp
- copied unchanged from r150469, cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/p12.cpp
cfe/branches/tooling/test/CXX/expr/expr.prim/expr.prim.lambda/p13.cpp
- copied unchanged from r150469, cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/p13.cpp
cfe/branches/tooling/test/CXX/expr/expr.prim/expr.prim.lambda/p16.cpp
- copied unchanged from r150469, cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/p16.cpp
cfe/branches/tooling/test/CXX/expr/expr.prim/expr.prim.lambda/p18.cpp
- copied unchanged from r150469, cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/p18.cpp
cfe/branches/tooling/test/CXX/expr/expr.prim/expr.prim.lambda/p19.cpp
- copied unchanged from r150469, cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/p19.cpp
cfe/branches/tooling/test/CXX/expr/expr.prim/expr.prim.lambda/p2.cpp
- copied unchanged from r150469, cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/p2.cpp
cfe/branches/tooling/test/CXX/expr/expr.prim/expr.prim.lambda/p20.cpp
- copied unchanged from r150469, cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/p20.cpp
cfe/branches/tooling/test/CXX/expr/expr.prim/expr.prim.lambda/p21.cpp
- copied unchanged from r150469, cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/p21.cpp
cfe/branches/tooling/test/CXX/expr/expr.prim/expr.prim.lambda/p3.cpp
- copied unchanged from r150469, cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/p3.cpp
cfe/branches/tooling/test/CXX/expr/expr.prim/expr.prim.lambda/p4.cpp
- copied unchanged from r150469, cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/p4.cpp
cfe/branches/tooling/test/CXX/expr/expr.prim/expr.prim.lambda/p6.cpp
- copied unchanged from r150469, cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/p6.cpp
cfe/branches/tooling/test/CXX/expr/expr.prim/expr.prim.lambda/p7.cpp
- copied unchanged from r150469, cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/p7.cpp
cfe/branches/tooling/test/CXX/expr/expr.prim/expr.prim.lambda/templates.cpp
- copied unchanged from r150469, cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/templates.cpp
cfe/branches/tooling/test/CodeGen/mips64-class-return.cpp
- copied unchanged from r150469, cfe/trunk/test/CodeGen/mips64-class-return.cpp
cfe/branches/tooling/test/CodeGen/mips64-nontrivial-return.cpp
- copied unchanged from r150469, cfe/trunk/test/CodeGen/mips64-nontrivial-return.cpp
cfe/branches/tooling/test/CodeGenCXX/debug-info-artificial-arg.cpp
- copied unchanged from r150469, cfe/trunk/test/CodeGenCXX/debug-info-artificial-arg.cpp
cfe/branches/tooling/test/CodeGenCXX/debug-info-dup-fwd-decl.cpp
- copied unchanged from r150469, cfe/trunk/test/CodeGenCXX/debug-info-dup-fwd-decl.cpp
cfe/branches/tooling/test/CodeGenCXX/debug-info-template-recursive.cpp
- copied unchanged from r150469, cfe/trunk/test/CodeGenCXX/debug-info-template-recursive.cpp
cfe/branches/tooling/test/CodeGenCXX/lambda-expressions.cpp
- copied unchanged from r150469, cfe/trunk/test/CodeGenCXX/lambda-expressions.cpp
cfe/branches/tooling/test/CodeGenObjC/debug-info-property5.m
- copied unchanged from r150469, cfe/trunk/test/CodeGenObjC/debug-info-property5.m
cfe/branches/tooling/test/Driver/prefixed-tools.c-helper/
- copied from r150464, cfe/branches/tooling/test/Driver/prefixed-tools.c-helper/
cfe/branches/tooling/test/Index/complete-in-invalid-method.m
- copied unchanged from r150469, cfe/trunk/test/Index/complete-in-invalid-method.m
cfe/branches/tooling/test/Index/index-suppress-refs.cpp
- copied unchanged from r150469, cfe/trunk/test/Index/index-suppress-refs.cpp
cfe/branches/tooling/test/Index/index-suppress-refs.hpp
- copied unchanged from r150469, cfe/trunk/test/Index/index-suppress-refs.hpp
cfe/branches/tooling/test/Lexer/Inputs/
- copied from r150464, cfe/branches/tooling/test/Lexer/Inputs/
cfe/branches/tooling/test/PCH/cxx-trailing-return.cpp
- copied unchanged from r150469, cfe/trunk/test/PCH/cxx-trailing-return.cpp
cfe/branches/tooling/test/PCH/rdar10830559.cpp
- copied unchanged from r150469, cfe/trunk/test/PCH/rdar10830559.cpp
cfe/branches/tooling/test/Rewriter/func-in-impl.m
- copied unchanged from r150469, cfe/trunk/test/Rewriter/func-in-impl.m
cfe/branches/tooling/test/SemaCXX/atomic-type.cxx
- copied unchanged from r150469, cfe/trunk/test/SemaCXX/atomic-type.cxx
cfe/branches/tooling/test/SemaCXX/function-extern-c.cpp
- copied unchanged from r150469, cfe/trunk/test/SemaCXX/function-extern-c.cpp
cfe/branches/tooling/test/SemaTemplate/instantiation-order.cpp
- copied unchanged from r150469, cfe/trunk/test/SemaTemplate/instantiation-order.cpp
cfe/branches/tooling/test/SemaTemplate/nested-incomplete-class.cpp
- copied unchanged from r150469, cfe/trunk/test/SemaTemplate/nested-incomplete-class.cpp
cfe/branches/tooling/test/SemaTemplate/pragma-ms_struct.cpp
- copied unchanged from r150469, cfe/trunk/test/SemaTemplate/pragma-ms_struct.cpp
cfe/branches/tooling/test/Tooling/
- copied from r150464, cfe/branches/tooling/test/Tooling/
cfe/branches/tooling/test/Tooling/remove-cstr-calls.cpp
- copied unchanged from r150464, cfe/branches/tooling/test/Tooling/remove-cstr-calls.cpp
cfe/branches/tooling/utils/find-unused-diagnostics.sh
- copied unchanged from r150469, cfe/trunk/utils/find-unused-diagnostics.sh
cfe/branches/tooling/www/analyzer/downloads/
- copied from r150464, cfe/branches/tooling/www/analyzer/downloads/
Modified:
cfe/branches/tooling/ (props changed)
cfe/branches/tooling/test/SemaCXX/warn-unreachable.cpp (props changed)
Propchange: cfe/branches/tooling/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 14 04:19:43 2012
@@ -1,3 +1,3 @@
/cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:146581-150467
+/cfe/trunk:146581-150469
/cfe/trunk/test/SemaTemplate:126920
Propchange: cfe/branches/tooling/clang.xcodeproj/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Feb 14 04:19:43 2012
@@ -0,0 +1,2 @@
+*.mode1
+*.pbxuser
Propchange: cfe/branches/tooling/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 14 04:19:43 2012
@@ -1,2 +1,2 @@
/cfe/branches/type-system-rewrite/test/SemaCXX/warn-unreachable.cpp:134693-134817
-/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,146581-150467
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,146581-150469
More information about the llvm-branch-commits
mailing list