<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Thu, May 19, 2016 at 11:15 AM, David Majnemer via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: majnemer<br>
Date: Thu May 19 13:15:53 2016<br>
New Revision: 270089<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=270089&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=270089&view=rev</a><br>
Log:<br>
[MS ABI] Ignore transparent contexts when determining the effective context<br>
<br>
We didn't skip over extern "C++" contexts, causing us to mangle things<br>
which don't need to be mangled.<br></blockquote><div><br></div><div>Hah, I guess I should have checked MS ABI when I fixed the same bug for Itanium a week or two ago :)</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Modified:<br>
    cfe/trunk/lib/AST/MicrosoftMangle.cpp<br>
    cfe/trunk/test/CodeGenCXX/mangle-ms.cpp<br>
<br>
Modified: cfe/trunk/lib/AST/MicrosoftMangle.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/MicrosoftMangle.cpp?rev=270089&r1=270088&r2=270089&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/MicrosoftMangle.cpp?rev=270089&r1=270088&r2=270089&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/AST/MicrosoftMangle.cpp (original)<br>
+++ cfe/trunk/lib/AST/MicrosoftMangle.cpp Thu May 19 13:15:53 2016<br>
@@ -94,7 +94,7 @@ static const DeclContext *getEffectiveDe<br>
     return getEffectiveDeclContext(cast<Decl>(DC));<br>
   }<br>
<br>
-  return DC;<br>
+  return DC->getRedeclContext();<br>
 }<br>
<br>
 static const DeclContext *getEffectiveParentContext(const DeclContext *DC) {<br>
<br>
Modified: cfe/trunk/test/CodeGenCXX/mangle-ms.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-ms.cpp?rev=270089&r1=270088&r2=270089&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-ms.cpp?rev=270089&r1=270088&r2=270089&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenCXX/mangle-ms.cpp (original)<br>
+++ cfe/trunk/test/CodeGenCXX/mangle-ms.cpp Thu May 19 13:15:53 2016<br>
@@ -4,6 +4,11 @@<br>
 int a;<br>
 // CHECK-DAG: @"\01?a@@3HA"<br>
<br>
+extern "C++" {<br>
+static int __attribute__((used)) ignore_transparent_context;<br>
+// CHECK-DAG: @ignore_transparent_context<br>
+}<br>
+<br>
 namespace N {<br>
   int b;<br>
 // CHECK-DAG: @"\01?b@N@@3HA"<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>