[llvm-branch-commits] [cfe-branch] r168331 - in /cfe/branches/release_32: ./ lib/AST/MicrosoftMangle.cpp

[Pawel Wodnicki]

Author: pawel
Date: Mon Nov 19 15:37:34 2012
New Revision: 168331

URL: http://llvm.org/viewvc/llvm-project?rev=168331&view=rev
Log:
Merging r168124 into 3.2 release branch

Fix PR14321, a crash when Clang is built with GCC 4.7 at -O1 or greater.

GCC 4.7 reuses stack slots fairly aggressively, which exposes more temporary
lifetime bugs.

No new test, this was caught by the existing CodeGenCXX/mangle-ms-templates.cpp.

Modified:
    cfe/branches/release_32/   (props changed)
    cfe/branches/release_32/lib/AST/MicrosoftMangle.cpp

Propchange: cfe/branches/release_32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 19 15:37:34 2012
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:167749,167762,167780,167788,167790,167813-167814,167868,167884,167920,168024
+/cfe/trunk:167749,167762,167780,167788,167790,167813-167814,167868,167884,167920,168024,168124
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_32/lib/AST/MicrosoftMangle.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_32/lib/AST/MicrosoftMangle.cpp?rev=168331&r1=168330&r2=168331&view=diff
==============================================================================
--- cfe/branches/release_32/lib/AST/MicrosoftMangle.cpp (original)
+++ cfe/branches/release_32/lib/AST/MicrosoftMangle.cpp Mon Nov 19 15:37:34 2012
@@ -373,7 +373,7 @@
       dyn_cast<ClassTemplateSpecializationDecl>(ND)) {
     TypeSourceInfo *TSI = Spec->getTypeAsWritten();
     if (TSI) {
-      TemplateSpecializationTypeLoc &TSTL =
+      TemplateSpecializationTypeLoc TSTL =
         cast<TemplateSpecializationTypeLoc>(TSI->getTypeLoc());
       TemplateArgumentListInfo LI(TSTL.getLAngleLoc(), TSTL.getRAngleLoc());
       for (unsigned i = 0, e = TSTL.getNumArgs(); i != e; ++i)