---

yaml
---
r: 268287
b: refs/heads/marcrasi-const-evaluator-part-2
c: 0faf870
h: refs/heads/master
i:
  268285: 4a91f61
  268283: 26823a0
  268279: b95b6ed
  268271: b60479c
  268255: 2a137cb
  268223: 7c4cb07
  268159: 25b954d
  268031: 7454950
  267775: d381b47
  267263: 4a11404
  266239: d4f560f

Author: compnerd

[refs]

@@ -1081,7 +1081,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-09-28-a: c30bf9b3ca148b1b90ebcd80141d9
 refs/heads/bananaphone: 2af9a1dc7f40dcb4b2949876f7e237763d1a7972
 refs/heads/marcrasi-const-evaluator-part-3: 867d96d6aa4cfb5079b7478be617387a1f621c88
 refs/heads/marcrasi-const-evaluator-part-1: 390daeaeea2181a1fc24910e09b5861053cd3558
-refs/heads/marcrasi-const-evaluator-part-2: f521e1d395e2c1b1f82e8e59049c0300fca258aa
+refs/heads/marcrasi-const-evaluator-part-2: 0faf87008c3f88610359c722f2df9286f28958a4
 refs/heads/revert-19689-keep-sourcekitd-response-alive-while-variant-lives: b5b1d9ab2340a64a3c7332529cdca1cb2318d93c
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-01-a: 63059bdab8bbcdd68591738fa28c68c8c19bde75
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-02-a: 12514879eff2c34a64ac6e65b323447f6525cfd0

branches/marcrasi-const-evaluator-part-2/benchmark/scripts/run_smoke_bench

@@ -139,7 +139,7 @@ def test_performance(opt_level, old_dir, new_dir, threshold, num_samples,
     new_lines = ""
 
     # #,TEST,SAMPLES,MIN(μs),MAX(μs),MEAN(μs),SD(μs),MEDIAN(μs),PEAK_MEMORY(B)
-    score_re = re.compile(r"(\d+),([\w.\-]+),\d+,(\d+)")
+    score_re = re.compile(r"(\d+),(\w+),\d+,(\d+)")
 
     while to_test is None or len(to_test) > 0:
         tested_benchmarks = set()
@@ -221,8 +221,7 @@ def get_results(bench_dir, opt_level, num_samples, to_test):
         if to_test:
             args += to_test
         env = {'DYLD_LIBRARY_PATH': os.path.join(bench_dir, 'lib', 'swift',
-               'macos'),
-               'SWIFT_DETERMINISTIC_HASHING': '1'}
+               'macos')}
         output = subprocess.check_output(args, env=env)
     except subprocess.CalledProcessError as e:
         sys.stderr.write(e.output)

branches/marcrasi-const-evaluator-part-2/benchmark/scripts/run_smoke_bench.py

@@ -96,7 +96,7 @@ def log_filename(bench_dir):
     new_logf = open(log_filename(new_dir), 'w')
 
     # #,TEST,SAMPLES,MIN(μs),MAX(μs),MEAN(μs),SD(μs),MEDIAN(μs),PEAK_MEMORY(B)
-    score_re = re.compile(r"(\d+),([\w.\-]+),\d+,(\d+)")
+    score_re = re.compile(r"(\d+),(\w+),\d+,(\d+)")
 
     while to_test is None or len(to_test) > 0:
         tested_benchmarks = set()
@@ -180,8 +180,7 @@ def get_results(bench_dir, opt_level, num_samples, to_test):
         if to_test:
             args += to_test
         env = {'DYLD_LIBRARY_PATH': os.path.join(bench_dir, 'lib', 'swift',
-               'macos'),
-               'SWIFT_DETERMINISTIC_HASHING': '1'}
+               'macos')}
         output = subprocess.check_output(args, env=env)
     except subprocess.CalledProcessError as e:
         sys.stderr.write(e.output)

branches/marcrasi-const-evaluator-part-2/docs/WindowsBuild.md

@@ -106,19 +106,24 @@ popd
 cmake --build "%swift_source_dir%/build/Ninja-DebugAssert/cmark-windows-amd64/"
 ```
 
-### 6. Build LLVM/Clang
+### 6. Build LLVM/Clang/Compiler-RT
 - This must be done from within a developer command prompt. LLVM and Clang are
   large projects, so building might take a few hours. Make sure that the build
   type (e.g. `Debug`, `Release`, `RelWithDebInfoAssert`) for LLVM/Clang matches the
   build type for Swift.
+- Optionally, you can omit building compiler-rt by removing all lines referring
+  to `compiler-rt` below, which should give faster build times.
 ```cmd
+mklink /J "%swift_source_dir%/llvm/tools/compiler-rt" "%swift_source_dir%/compiler-rt"
 mkdir "%swift_source_dir%/build/Ninja-DebugAssert/llvm-windows-amd64"
 pushd "%swift_source_dir%/build/Ninja-DebugAssert/llvm-windows-amd64"
 cmake -G "Ninja"^
  -DLLVM_ENABLE_ASSERTIONS=TRUE^
  -DCMAKE_BUILD_TYPE=Debug^
  -DLLVM_TOOL_SWIFT_BUILD=NO^
  -DLLVM_INCLUDE_DOCS=TRUE^
+ -DLLVM_TOOL_COMPILER_RT_BUILD=TRUE^
+ -DLLVM_BUILD_EXTERNAL_COMPILER_RT=TRUE^
  -DLLVM_ENABLE_PROJECTS=clang^
  -DLLVM_LIT_ARGS=-sv^
  -DLLVM_TARGETS_TO_BUILD=X86^

branches/marcrasi-const-evaluator-part-2/include/swift/Basic/Lazy.h

@@ -58,9 +58,6 @@ template <class T> class Lazy {
 
   T &get(void (*initCallback)(void *) = defaultInitCallback);
 
-  template<typename Arg1>
-  T &getWithInit(Arg1 &&arg1);
-
   /// Get the value, assuming it must have already been initialized by this
   /// point.
   T &unsafeGetAlreadyInitialized() { return *reinterpret_cast<T *>(&Value); }
@@ -83,22 +80,6 @@ template <typename T> inline T &Lazy<T>::get(void (*initCallback)(void*)) {
   return unsafeGetAlreadyInitialized();
 }
 
-template <typename T>
-template <typename Arg1> inline T &Lazy<T>::getWithInit(Arg1 &&arg1) {
-  struct Data {
-    void *address;
-    Arg1 &&arg1;
-
-    static void init(void *context) {
-      Data *data = static_cast<Data *>(context);
-      ::new (data->address) T(static_cast<Arg1&&>(data->arg1));
-    }
-  } data{&Value, static_cast<Arg1&&>(arg1)};
-
-  SWIFT_ONCE_F(OnceToken, &Data::init, &data);
-  return unsafeGetAlreadyInitialized();
-}
-
 } // end namespace swift
 
 #define SWIFT_LAZY_CONSTANT(INITIAL_VALUE) \

branches/marcrasi-const-evaluator-part-2/include/swift/Basic/SourceLoc.h

@@ -132,6 +132,8 @@ class CharSourceRange {
   /// \brief Constructs an invalid range.
   CharSourceRange() = default;
 
+  CharSourceRange &operator=(const CharSourceRange &) = default;
+
   CharSourceRange(SourceLoc Start, unsigned ByteLength)
     : Start(Start), ByteLength(ByteLength) {}
 

branches/marcrasi-const-evaluator-part-2/include/swift/Basic/TreeScopedHashTable.h

@@ -37,7 +37,6 @@ template <typename K, typename V> class TreeScopedHashTableVal {
   TreeScopedHashTableVal(const K &Key, const V &Val) : Key(Key), Val(Val) {}
 
 public:
-  ~TreeScopedHashTableVal() = default;
   TreeScopedHashTableVal(const TreeScopedHashTableVal &) = delete;
   TreeScopedHashTableVal(TreeScopedHashTableVal &&) = delete;
   TreeScopedHashTableVal &operator=(const TreeScopedHashTableVal &) = delete;

branches/marcrasi-const-evaluator-part-2/include/swift/SwiftRemoteMirror/SwiftRemoteMirror.h

@@ -39,7 +39,7 @@ extern "C" {
 
 /// Get the metadata version supported by the Remote Mirror library.
 SWIFT_REMOTE_MIRROR_LINKAGE
-uint16_t swift_reflection_getSupportedMetadataVersion(void);
+uint16_t swift_reflection_getSupportedMetadataVersion();
 
 /// \returns An opaque reflection context.
 SWIFT_REMOTE_MIRROR_LINKAGE

branches/marcrasi-const-evaluator-part-2/include/swift/SwiftRemoteMirror/SwiftRemoteMirrorLegacyInterop.h

@@ -25,7 +25,6 @@
 #include "SwiftRemoteMirrorLegacyInteropTypes.h"
 #include "SwiftRemoteMirror.h"
 
-#include <string.h>
 #include <dlfcn.h>
 #include <mach-o/getsect.h>
 
@@ -38,19 +37,14 @@
 static inline SwiftReflectionInteropContextRef
 swift_reflection_interop_createReflectionContext(
     void *ReaderContext,
+    void *LibraryHandle,
+    void *LegacyLibraryHandle,
     uint8_t PointerSize,
     FreeBytesFunction FreeBytes,
     ReadBytesFunction ReadBytes,
     GetStringLengthFunction GetStringLength,
     GetSymbolAddressFunction GetSymbolAddress);
 
-/// Add a library handle to the interop context. Returns 1 if the
-/// library was added successfully, 0 if a symbol couldn't be looked up
-/// or the reported metadata version is too old.
-static inline int
-swift_reflection_interop_addLibrary(
-  SwiftReflectionInteropContextRef ContextRef, void *LibraryHandle);
-
 static inline void
 swift_reflection_interop_destroyReflectionContext(
   SwiftReflectionInteropContextRef ContextRef);
@@ -289,7 +283,6 @@ struct SwiftReflectionInteropContextLegacyImageRangeList {
 
 struct SwiftReflectionInteropContext {
   void *ReaderContext;
-  uint8_t PointerSize;
   FreeBytesFunction FreeBytes;
   ReadBytesFunction ReadBytes;
   uint64_t (*GetStringLength)(void *reader_context,
@@ -298,7 +291,8 @@ struct SwiftReflectionInteropContext {
                                    const char *name,
                                    uint64_t name_length);
 
-  struct SwiftReflectionInteropContextLibrary *Libraries;
+  // Currently we support at most two libraries.
+  struct SwiftReflectionInteropContextLibrary Libraries[2];
   int LibraryCount;
 
   struct SwiftReflectionInteropContextFreeList *FreeList;
@@ -387,11 +381,12 @@ swift_reflection_interop_libraryForObject(
   return swift_reflection_interop_libraryForAddress(ContextRef, Metadata);
 }
 
-static inline int
+static inline void
 swift_reflection_interop_loadFunctions(struct SwiftReflectionInteropContext *Context,
-                                       void *Handle) {
+                                       void *Handle,
+                                       int IsLegacy) {
   if (Handle == NULL)
-    return 0;
+    return;
 
   struct SwiftReflectionInteropContextLibrary *Library = &Context
     ->Libraries[Context->LibraryCount];
@@ -402,16 +397,14 @@ swift_reflection_interop_loadFunctions(struct SwiftReflectionInteropContext *Con
 #endif
 #define LOAD_NAMED(field, symbol) do { \
     Functions->field = (decltype(Functions->field))dlsym(Handle, symbol); \
-    if (Functions->field == NULL) return 0; \
+    if (Functions->field == NULL) return; \
   } while (0)
 #define LOAD(name) LOAD_NAMED(name, "swift_reflection_" #name)
 
   LOAD(getSupportedMetadataVersion);
   uint16_t version = Functions->getSupportedMetadataVersion();
   if (version < SWIFT_LEGACY_METADATA_MIN_VERSION)
-    return 0;
-  
-  int IsLegacy = dlsym(Handle, "swift_reflection_addImage") == NULL;
+    return;
 
   if (IsLegacy) {
     LOAD_NAMED(createReflectionContextLegacy, "swift_reflection_createReflectionContext");
@@ -445,7 +438,7 @@ swift_reflection_interop_loadFunctions(struct SwiftReflectionInteropContext *Con
   Library->IsLegacy = IsLegacy;
   Context->LibraryCount++;
 
-  return 1;
+  return;
 
 #undef LOAD
 #undef LOAD_NAMED
@@ -477,7 +470,6 @@ swift_reflection_interop_readBytesAdapter(void *reader_context,
 static inline uint8_t
 swift_reflection_interop_getSizeAdapter(void *reader_context) {
   // Legacy library doesn't pay attention to these anyway.
-  (void)reader_context;
   return sizeof(void *);
 }
 
@@ -500,6 +492,8 @@ swift_reflection_interop_GetSymbolAddressAdapter(
 static inline SwiftReflectionInteropContextRef
 swift_reflection_interop_createReflectionContext(
     void *ReaderContext,
+    void *LibraryHandle,
+    void *LegacyLibraryHandle,
     uint8_t PointerSize,
     FreeBytesFunction FreeBytes,
     ReadBytesFunction ReadBytes,
@@ -509,27 +503,15 @@ swift_reflection_interop_createReflectionContext(
   SwiftReflectionInteropContextRef ContextRef =
     (SwiftReflectionInteropContextRef)calloc(sizeof(*ContextRef), 1);
 
-  ContextRef->ReaderContext = ReaderContext;
-  ContextRef->PointerSize = PointerSize;
-  ContextRef->FreeBytes = FreeBytes;
-  ContextRef->ReadBytes = ReadBytes;
-  ContextRef->GetStringLength = GetStringLength;
-  ContextRef->GetSymbolAddress = GetSymbolAddress;
+  swift_reflection_interop_loadFunctions(ContextRef, LibraryHandle, 0);
+  swift_reflection_interop_loadFunctions(ContextRef, LegacyLibraryHandle, 1);
 
-  ContextRef->AddressToLibraryCache = CFDictionaryCreateMutable(NULL, 0, NULL, NULL);
+  if (ContextRef->LibraryCount == 0) {
+    free(ContextRef);
+    return NULL;
+  }
 
-  return ContextRef;
-}
-
-static inline int
-swift_reflection_interop_addLibrary(
-  SwiftReflectionInteropContextRef ContextRef, void *LibraryHandle) {
-  size_t NewSize = (ContextRef->LibraryCount + 1) * sizeof(*ContextRef->Libraries);
-  ContextRef->Libraries = realloc(ContextRef->Libraries, NewSize);
-  int Success = swift_reflection_interop_loadFunctions(ContextRef, LibraryHandle);
-  if (Success) {
-    struct SwiftReflectionInteropContextLibrary *Library =
-      &ContextRef->Libraries[ContextRef->LibraryCount - 1];
+  FOREACH_LIBRARY {
     if (Library->IsLegacy) {
       Library->Context = Library->Functions.createReflectionContextLegacy(
         ContextRef,
@@ -538,12 +520,20 @@ swift_reflection_interop_addLibrary(
         swift_reflection_interop_GetStringLengthAdapter,
         swift_reflection_interop_GetSymbolAddressAdapter);
     } else {
-      Library->Context = Library->Functions.createReflectionContext(
-        ContextRef->ReaderContext,
-      ContextRef->PointerSize, ContextRef->FreeBytes, ContextRef->ReadBytes, ContextRef->GetStringLength, ContextRef->GetSymbolAddress);
+      Library->Context = Library->Functions.createReflectionContext(ReaderContext,
+      PointerSize, FreeBytes, ReadBytes, GetStringLength, GetSymbolAddress);
     }
   }
-  return Success;
+  
+  ContextRef->ReaderContext = ReaderContext;
+  ContextRef->FreeBytes = FreeBytes;
+  ContextRef->ReadBytes = ReadBytes;
+  ContextRef->GetStringLength = GetStringLength;
+  ContextRef->GetSymbolAddress = GetSymbolAddress;
+  
+  ContextRef->AddressToLibraryCache = CFDictionaryCreateMutable(NULL, 0, NULL, NULL);
+  
+  return ContextRef;
 }
 
 static inline void
@@ -552,7 +542,6 @@ swift_reflection_interop_destroyReflectionContext(
   FOREACH_LIBRARY {
     Library->Functions.destroyReflectionContext(Library->Context);
   }
-  free(ContextRef->Libraries);
   struct SwiftReflectionInteropContextLegacyImageRangeList *LegacyImageRangeList
     = ContextRef->LegacyImageRangeList;
   while (LegacyImageRangeList != NULL) {
@@ -679,14 +668,14 @@ swift_reflection_interop_addImageLegacy(
   }
 
   info.LocalStartAddress = (uintptr_t)Buf;
-  info.RemoteStartAddress = (uintptr_t)ImageStart;
+  info.RemoteStartAddress = ImageStart;
 
   Library->Functions.addReflectionInfoLegacy(Library->Context, info);
 
   // Find the data segment and add it to our list.
   unsigned long DataSize;
   const uint8_t *DataSegment = getsegmentdata(Header, "__DATA", &DataSize);
-  uintptr_t DataSegmentStart = (uintptr_t)(DataSegment - (const uint8_t *)Buf + ImageStart);
+  uintptr_t DataSegmentStart = DataSegment - (const uint8_t *)Buf + ImageStart;
 
   struct SwiftReflectionInteropContextLegacyImageRangeList *Node =
     (struct SwiftReflectionInteropContextLegacyImageRangeList *)malloc(sizeof(*Node));
@@ -698,12 +687,12 @@ swift_reflection_interop_addImageLegacy(
   // If the buffer needs to be freed, save buffer and free context to free it when the
   //  reflection context is destroyed.
   if (ContextRef->FreeBytes != NULL) {
-    struct SwiftReflectionInteropContextFreeList *FreeListNode =
-      (struct SwiftReflectionInteropContextFreeList *)malloc(sizeof(*FreeListNode));
-    FreeListNode->Next = ContextRef->FreeList;
-    FreeListNode->Pointer = Buf;
-    FreeListNode->Context = FreeContext;
-    ContextRef->FreeList = FreeListNode;
+    struct SwiftReflectionInteropContextFreeList *Node =
+      (struct SwiftReflectionInteropContextFreeList *)malloc(sizeof(*Node));
+    Node->Next = ContextRef->FreeList;
+    Node->Pointer = Buf;
+    Node->Context = FreeContext;
+    ContextRef->FreeList = Node;
   }
 
   return 1;
@@ -747,7 +736,7 @@ swift_reflection_interop_lookupMetadata(SwiftReflectionInteropContextRef Context
     swift_reflection_interop_libraryForAddress(ContextRef, Metadata);
   if (Library != NULL) {
     Result.Metadata = Metadata;
-    Result.Library = (int)LIBRARY_INDEX;
+    Result.Library = LIBRARY_INDEX;
   }
   return Result;
 }
@@ -773,7 +762,7 @@ swift_reflection_interop_typeRefForInstance(SwiftReflectionInteropContextRef Con
     swift_typeref_t Typeref = Library->Functions.typeRefForInstance(Library->Context,
                                                                     Object);
     Result.Typeref = Typeref;
-    Result.Library = (int)LIBRARY_INDEX;
+    Result.Library = LIBRARY_INDEX;
   }
   return Result;
 }
@@ -791,7 +780,7 @@ swift_reflection_interop_typeRefForMangledTypeName(
       continue;
 
     Result.Typeref = Typeref;
-    Result.Library = (int)LIBRARY_INDEX;
+    Result.Library = LIBRARY_INDEX;
     return Result;
   }
 
@@ -878,7 +867,7 @@ swift_reflection_interop_childOfInstance(SwiftReflectionInteropContextRef Contex
     Result.Offset = LibResult.Offset;
     Result.Kind = LibResult.Kind;
     Result.TR.Typeref = LibResult.TR;
-    Result.TR.Library = (int)LIBRARY_INDEX;
+    Result.TR.Library = LIBRARY_INDEX;
   } else {
     Result.Kind = SWIFT_UNKNOWN;
   }

branches/marcrasi-const-evaluator-part-2/include/swift/SwiftRemoteMirror/SwiftRemoteMirrorTypes.h

@@ -108,9 +108,9 @@ typedef enum swift_layout_kind {
 
   // References to other objects in the heap.
   SWIFT_STRONG_REFERENCE,
-  SWIFT_UNOWNED_REFERENCE,
-  SWIFT_WEAK_REFERENCE,
-  SWIFT_UNMANAGED_REFERENCE,
+#define REF_STORAGE(Name, name, NAME) \
+  SWIFT_##NAME##_REFERENCE,
+#include "swift/AST/ReferenceStorage.def"
 
   // Layouts of heap objects. These are only ever returned from
   // swift_reflection_infoFor{Instance,Metadata}(), and not