Merge pull request #3360 from jckarter/no-static-locals

StdlibStubs: Favor swift::Lazy over static local initialization.

Author: jckarter

include/swift/Basic/Lazy.h

@@ -13,6 +13,7 @@
 #ifndef SWIFT_BASIC_LAZY_H
 #define SWIFT_BASIC_LAZY_H
 
+#include <memory>
 #ifdef __APPLE__
 #include <dispatch/dispatch.h>
 #else

stdlib/public/stubs/Availability.mm

@@ -14,6 +14,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "swift/Basic/Lazy.h"
 #include "swift/Runtime/Debug.h"
 #import <Foundation/Foundation.h>
 #include <TargetConditionals.h>
@@ -73,20 +74,22 @@ static NSOperatingSystemVersion operatingSystemVersionFromPlist() {
   return versionStruct;
 }
 
+static NSOperatingSystemVersion getOSVersion() {
+  // Use -[NSProcessInfo.operatingSystemVersion] when present
+  // (on iOS 8 and OS X 10.10 and above).
+  if ([NSProcessInfo
+       instancesRespondToSelector:@selector(operatingSystemVersion)]) {
+    return [[NSProcessInfo processInfo] operatingSystemVersion];
+  } else {
+    // Otherwise load and parse from SystemVersion dictionary.
+    return operatingSystemVersionFromPlist();
+  }
+}
+
 /// Return the version of the operating system currently running for use in
 /// API availability queries.
 _SwiftNSOperatingSystemVersion swift::_swift_stdlib_operatingSystemVersion() {
-  static NSOperatingSystemVersion version = ([]{
-    // Use -[NSProcessInfo.operatingSystemVersion] when present
-    // (on iOS 8 and OS X 10.10 and above).
-    if ([NSProcessInfo
-         instancesRespondToSelector:@selector(operatingSystemVersion)]) {
-      return [[NSProcessInfo processInfo] operatingSystemVersion];
-    } else {
-      // Otherwise load and parse from SystemVersion dictionary.
-      return operatingSystemVersionFromPlist();
-    }
-  })();
+  NSOperatingSystemVersion version = SWIFT_LAZY_CONSTANT(getOSVersion());
 
   return { version.majorVersion, version.minorVersion, version.patchVersion };
 }

stdlib/public/stubs/LibcShims.cpp

@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include "swift/Basic/Lazy.h"
 #include "../SwiftShims/LibcShims.h"
 #include "llvm/Support/DataTypes.h"
 
@@ -105,9 +106,10 @@ size_t swift::_swift_stdlib_malloc_size(const void *ptr) {
 #error No malloc_size analog known for this platform/libc.
 #endif
 
+static Lazy<std::mt19937> theGlobalMT19937;
+
 static std::mt19937 &getGlobalMT19937() {
-  static std::mt19937 MersenneRandom;
-  return MersenneRandom;
+  return theGlobalMT19937.get();
 }
 
 __swift_uint32_t swift::_swift_stdlib_cxx11_mt19937() {

stdlib/public/stubs/UnicodeNormalization.cpp

@@ -14,6 +14,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "swift/Basic/Lazy.h"
 #include "swift/Runtime/Config.h"
 #include "swift/Runtime/Debug.h"
 
@@ -63,21 +64,19 @@ static const UCollator *MakeRootCollator() {
 // const here to make sure we don't misuse it.
 // http://sourceforge.net/p/icu/mailman/message/27427062/
 static const UCollator *GetRootCollator() {
-  static const UCollator *RootCollator = MakeRootCollator();
-  return RootCollator;
+  return SWIFT_LAZY_CONSTANT(MakeRootCollator());
 }
 
 /// This class caches the collation element results for the ASCII subset of
 /// unicode.
 class ASCIICollation {
   int32_t CollationTable[128];
 public:
+  friend class swift::Lazy<ASCIICollation>;
 
+  static swift::Lazy<ASCIICollation> theTable;
   static const ASCIICollation *getTable() {
-    // We are reallying on C++11's guaranteed of thread safe static variable
-    // initialization.
-    static ASCIICollation collation;
-    return &collation;
+    return &theTable.get();
   }
 
   /// Maps an ASCII character to a collation element priority as would be
@@ -343,3 +342,5 @@ swift::_swift_stdlib_unicode_strToLower(uint16_t *Destination,
   }
   return OutputLength;
 }
+
+swift::Lazy<ASCIICollation> ASCIICollation::theTable;