<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Sep 19, 2014 at 3:09 PM, Chris Bieneman <span dir="ltr"><<a href="mailto:beanz@apple.com" target="_blank">beanz@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: cbieneman<br>
Date: Fri Sep 19 17:09:18 2014<br>
New Revision: 218160<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=218160&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=218160&view=rev</a><br>
Log:<br>
Converting object's error_category to a ManagedStatic to avoid static constructors and destructors.<br></blockquote><div><br></div><div>Hmm. Pity. In C++14 std::error_category's ctor is required to be constexpr... well, one day when we adopt C++14 we can remove this workaround.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Modified:<br>
    llvm/trunk/lib/Object/Error.cpp<br>
<br>
Modified: llvm/trunk/lib/Object/Error.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/Error.cpp?rev=218160&r1=218159&r2=218160&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/Error.cpp?rev=218160&r1=218159&r2=218160&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Object/Error.cpp (original)<br>
+++ llvm/trunk/lib/Object/Error.cpp Fri Sep 19 17:09:18 2014<br>
@@ -13,6 +13,7 @@<br>
<br>
 #include "llvm/Object/Error.h"<br>
 #include "llvm/Support/ErrorHandling.h"<br>
+#include "llvm/Support/ManagedStatic.h"<br>
<br>
 using namespace llvm;<br>
 using namespace object;<br>
@@ -48,7 +49,8 @@ std::string _object_error_category::mess<br>
                    "defined.");<br>
 }<br>
<br>
+static ManagedStatic<_object_error_category> error_category;<br>
+<br>
 const std::error_category &object::object_category() {<br>
-  static _object_error_category o;<br>
-  return o;<br>
+  return *error_category;<br>
 }<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>