[llvm-branch-commits] [cfe-branch] r128022 - in /cfe/branches/release_29: ./ lib/CodeGen/CodeGenModule.cpp test/SemaCXX/warn-unreachable.cpp

[Bill Wendling]

Author: void
Date: Mon Mar 21 16:15:13 2011
New Revision: 128022

URL: http://llvm.org/viewvc/llvm-project?rev=128022&view=rev
Log:
--- Merging r127806 into '.':
U    lib/CodeGen/CodeGenModule.cpp


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

Propchange: cfe/branches/release_29/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 21 16:15:13 2011
@@ -1,2 +1,2 @@
-/cfe/trunk:127283,127308,127326,127373,127460,127512,127541,127543,127563,127623,127737-127738,127980
+/cfe/trunk:127283,127308,127326,127373,127460,127512,127541,127543,127563,127623,127737-127738,127806,127980
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_29/lib/CodeGen/CodeGenModule.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/lib/CodeGen/CodeGenModule.cpp?rev=128022&r1=128021&r2=128022&view=diff
==============================================================================
--- cfe/branches/release_29/lib/CodeGen/CodeGenModule.cpp (original)
+++ cfe/branches/release_29/lib/CodeGen/CodeGenModule.cpp Mon Mar 21 16:15:13 2011
@@ -1924,7 +1924,7 @@
 /// EmitObjCIvarInitializations - Emit information for ivar initialization
 /// for an implementation.
 void CodeGenModule::EmitObjCIvarInitializations(ObjCImplementationDecl *D) {
-  if (!Features.NeXTRuntime || D->getNumIvarInitializers() == 0)
+  if (D->getNumIvarInitializers() == 0)
     return;
   DeclContext* DC = const_cast<DeclContext*>(dyn_cast<DeclContext>(D));
   assert(DC && "EmitObjCIvarInitializations - null DeclContext");

Propchange: cfe/branches/release_29/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 21 16:15:13 2011
@@ -1 +1 @@
-/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,127283,127308,127326,127373,127460,127512,127541,127543,127563,127623,127737-127738,127980
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,127283,127308,127326,127373,127460,127512,127541,127543,127563,127623,127737-127738,127806,127980