[llvm-branch-commits] [cfe-branch] r149381 - in /cfe/branches/tooling: ./ lib/CodeGen/CGObjCMac.cpp test/SemaCXX/warn-unreachable.cpp

[Manuel Klimek]

Author: klimek
Date: Tue Jan 31 06:17:57 2012
New Revision: 149381

URL: http://llvm.org/viewvc/llvm-project?rev=149381&view=rev
Log:
Merging mainline.

Modified:
    cfe/branches/tooling/   (props changed)
    cfe/branches/tooling/lib/CodeGen/CGObjCMac.cpp
    cfe/branches/tooling/test/SemaCXX/warn-unreachable.cpp   (props changed)

Propchange: cfe/branches/tooling/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 31 06:17:57 2012
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:146581-149375
+/cfe/trunk:146581-149380
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/tooling/lib/CodeGen/CGObjCMac.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/tooling/lib/CodeGen/CGObjCMac.cpp?rev=149381&r1=149380&r2=149381&view=diff
==============================================================================
--- cfe/branches/tooling/lib/CodeGen/CGObjCMac.cpp (original)
+++ cfe/branches/tooling/lib/CodeGen/CGObjCMac.cpp Tue Jan 31 06:17:57 2012
@@ -4040,7 +4040,7 @@
   
   llvm::GlobalVariable * Entry =
   CreateMetadataVar("\01L_OBJC_CLASS_NAME_",
-                    llvm::ConstantDataArray::getString(VMContext, BitMap),
+                    llvm::ConstantDataArray::getString(VMContext, BitMap,false),
                     ((ObjCABI == 2) ?
                      "__TEXT,__objc_classname,cstring_literals" :
                      "__TEXT,__cstring,cstring_literals"),

Propchange: cfe/branches/tooling/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 31 06:17:57 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-149375
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,146581-149380