---

yaml
---
r: 268159
b: refs/heads/marcrasi-const-evaluator-part-2
c: 6072d9f
h: refs/heads/master
i:
  268157: 6eb3013
  268155: 56dcd68
  268151: 99ba01d
  268143: d2d1f2c
  268127: 75e247b
  268095: 548e04c
  268031: 7454950

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: fafd21e24f554fe4baa62466a6dd5b244af6cbfb
+refs/heads/marcrasi-const-evaluator-part-2: 6072d9f5dffdbbd4c583c3f441d0b8445c5efbf7
 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/docs/ABI/Mangling.rst

@@ -90,9 +90,9 @@ The following symbolic reference kinds are currently implemented:
    dependent-associated-conformance ::= '\x05' .{4}  // Reference points directly to associated conformance descriptor (NOT IMPLEMENTED)
    dependent-associated-conformance ::= '\x06' .{4}  // Reference points indirectly to associated conformance descriptor (NOT IMPLEMENTED)
 
-   associated-conformance-access-function ::= '\x07' .{4}  // Reference points directly to associated conformance access function relative to the protocol
-   associated-conformance-access-function ::= '\x08' .{4}  // Reference points directly to associated conformance access function relative to the conforming type
-   keypath-metadata-access-function ::= '\x09' {.4}  // Reference points directly to keypath conformance access function
+   associated-conformance-acceess-function ::= '\x07' .{4}  // Reference points directly to associated conformance access function relative to the protocol
+   associated-conformance-acceess-function ::= '\x08' .{4}  // Reference points directly to associated conformance access function relative to the conforming type
+   keypath-metadata-access-function ::= '\x09' {.4}  // Reference points directly to keypath type metadata access function
 
 Globals
 ~~~~~~~

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

@@ -2611,57 +2611,6 @@ class TargetGenericRequirementDescriptor {
 using GenericRequirementDescriptor =
   TargetGenericRequirementDescriptor<InProcess>;
 
-template<typename Runtime>
-class TargetGenericEnvironment
-    : public swift::ABI::TrailingObjects<TargetGenericEnvironment<Runtime>,
-               uint16_t, GenericParamDescriptor,
-               TargetGenericRequirementDescriptor<Runtime>> {
-  using GenericRequirementDescriptor =
-    TargetGenericRequirementDescriptor<Runtime>;
-  using TrailingObjects =
-     swift::ABI::TrailingObjects<TargetGenericEnvironment<Runtime>,
-       uint16_t, GenericParamDescriptor, GenericRequirementDescriptor>;
-  friend TrailingObjects;
-
-  template<typename T>
-  using OverloadToken = typename TrailingObjects::template OverloadToken<T>;
-
-  size_t numTrailingObjects(OverloadToken<uint16_t>) const {
-    return Flags.getNumGenericParameterLevels();
-  }
-
-  size_t numTrailingObjects(OverloadToken<GenericParamDescriptor>) const {
-    return getGenericParameterCounts().back();
-  }
-
-  size_t numTrailingObjects(OverloadToken<GenericRequirementDescriptor>) const {
-    return Flags.getNumGenericRequirements();
-  }
-
-  GenericEnvironmentFlags Flags;
-
-public:
-  /// Retrieve the cumulative generic parameter counts at each level of genericity.
-  ArrayRef<uint16_t> getGenericParameterCounts() const {
-    return ArrayRef<uint16_t>(this->template getTrailingObjects<uint16_t>(),
-                              Flags.getNumGenericParameterLevels());
-  }
-
-  /// Retrieve the generic parameters descriptors.
-  ArrayRef<GenericParamDescriptor> getGenericParameters() const {
-    return ArrayRef<GenericParamDescriptor>(
-             this->template getTrailingObjects<GenericParamDescriptor>(),
-             getGenericParameterCounts().back());
-  }
-
-  /// Retrieve the generic requirements.
-  ArrayRef<GenericRequirementDescriptor> getGenericRequirements() const {
-    return ArrayRef<GenericRequirementDescriptor>(
-             this->template getTrailingObjects<GenericRequirementDescriptor>(),
-             Flags.getNumGenericRequirements());
-  }
-};
-
 /// CRTP class for a context descriptor that includes trailing generic
 /// context description.
 template<class Self,

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

@@ -1508,45 +1508,6 @@ enum class GenericRequirementLayoutKind : uint32_t {
   Class = 0,
 };
 
-class GenericEnvironmentFlags {
-  uint32_t Value;
-
-  enum : uint32_t {
-    NumGenericParameterLevelsMask = 0xFFF,
-    NumGenericRequirementsShift = 12,
-    NumGenericRequirementsMask = 0xFFFF << NumGenericRequirementsShift,
-  };
-
-  constexpr explicit GenericEnvironmentFlags(uint32_t value) : Value(value) { }
-
-public:
-  constexpr GenericEnvironmentFlags() : Value(0) { }
-
-  constexpr GenericEnvironmentFlags
-  withNumGenericParameterLevels(uint16_t numGenericParameterLevels) const {
-    return GenericEnvironmentFlags((Value &~ NumGenericParameterLevelsMask)
-                                   | numGenericParameterLevels);
-  }
-
-  constexpr GenericEnvironmentFlags
-  withNumGenericRequirements(uint16_t numGenericRequirements) const {
-    return GenericEnvironmentFlags((Value &~ NumGenericRequirementsMask)
-             | (numGenericRequirements << NumGenericRequirementsShift));
-  }
-
-  constexpr unsigned getNumGenericParameterLevels() const {
-    return Value & NumGenericParameterLevelsMask;
-  }
-
-  constexpr unsigned getNumGenericRequirements() const {
-    return (Value & NumGenericRequirementsMask) >> NumGenericRequirementsShift;
-  }
-
-  constexpr uint32_t getIntValue() const {
-    return Value;
-  }
-};
-
 /// Flags used by generic metadata patterns.
 class GenericMetadataPatternFlags : public FlagSet<uint32_t> {
   enum {

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

@@ -50,12 +50,6 @@ void runAPIDiffMigratorPass(EditorAdapter &Editor,
                             SourceFile *SF,
                             const MigratorOptions &Opts);
 
-/// Run a pass to fix up the new type of 'try?' in Swift 4
-void runOptionalTryMigratorPass(EditorAdapter &Editor,
-                                SourceFile *SF,
-                                const MigratorOptions &Opts);
-  
-  
 } // end namespace migrator
 } // end namespace swift
 

branches/marcrasi-const-evaluator-part-2/lib/AST/ASTVerifier.cpp

@@ -1958,21 +1958,15 @@ class Verifier : public ASTWalker {
     void verifyChecked(OptionalTryExpr *E) {
       PrettyStackTraceExpr debugStack(Ctx, "verifying OptionalTryExpr", E);
 
-      if (Ctx.LangOpts.isSwiftVersionAtLeast(5)) {
-        checkSameType(E->getType(), E->getSubExpr()->getType(),
-                      "OptionalTryExpr and sub-expression");
-      }
-      else {
-        Type unwrappedType = E->getType()->getOptionalObjectType();
-        if (!unwrappedType) {
-          Out << "OptionalTryExpr result type is not optional\n";
-          abort();
-        }
-        
-        checkSameType(unwrappedType, E->getSubExpr()->getType(),
-                      "OptionalTryExpr and sub-expression");
+      Type unwrappedType = E->getType()->getOptionalObjectType();
+      if (!unwrappedType) {
+        Out << "OptionalTryExpr result type is not optional\n";
+        abort();
       }
-      
+
+      checkSameType(unwrappedType, E->getSubExpr()->getType(),
+                    "OptionalTryExpr and sub-expression");
+
       verifyCheckedBase(E);
     }
 

branches/marcrasi-const-evaluator-part-2/lib/AST/Expr.cpp

@@ -1821,13 +1821,6 @@ RebindSelfInConstructorExpr::getCalledConstructor(bool &isChainToSuper) const {
       candidate = covariantExpr->getSubExpr();
       continue;
     }
-    
-    // Look through inject into optional expressions
-    if (auto injectIntoOptionalExpr
-        = dyn_cast<InjectIntoOptionalExpr>(candidate)) {
-      candidate = injectIntoOptionalExpr->getSubExpr();
-      continue;
-    }
     break;
   }
 

branches/marcrasi-const-evaluator-part-2/lib/Demangling/Demangler.cpp

@@ -136,7 +136,7 @@ swift::Demangle::makeSymbolicMangledNameStringRef(const char *base) {
     // Skip over symbolic references.
     if (*end >= '\x01' && *end <= '\x17')
       end += sizeof(uint32_t);
-    else if (*end >= '\x18' && *end <= '\x1F')
+    if (*end >= '\x18' && *end <= '\x1F')
       end += sizeof(void*);
     ++end;
   }

branches/marcrasi-const-evaluator-part-2/lib/IRGen/GenKeyPath.cpp

@@ -657,7 +657,7 @@ emitGeneratorForKeyPath(IRGenModule &IGM,
                         ArrayRef<GenericRequirement> requirements,
                         llvm::function_ref<void(IRGenFunction&,CanType)> emit) {
 
-  return IGM.getAddrOfStringForMetadataRef(name, /*alignment=*/2,
+  return IGM.getAddrOfStringForMetadataRef(name,
       /*shouldSetLowBit=*/true,
       [&](ConstantInitBuilder &B) {
         // Build a stub that loads the necessary bindings from the key path's
@@ -707,11 +707,34 @@ emitMetadataGeneratorForKeyPath(IRGenModule &IGM,
                                 CanType type,
                                 GenericEnvironment *genericEnv,
                                 ArrayRef<GenericRequirement> requirements) {
-  // Produce a mangled name for the type.
-  auto constant = IGM.getTypeRef(type, MangledTypeRefRole::Metadata);
-  auto bitConstant = llvm::ConstantInt::get(IGM.IntPtrTy, 1);
-  return llvm::ConstantExpr::getGetElementPtr(nullptr, constant, bitConstant);
-}
+  // If we have a non-dependent type, use a normal mangled type name.
+  if (!type->hasTypeParameter()) {
+    auto constant = IGM.getTypeRef(type, MangledTypeRefRole::Metadata);
+    auto bitConstant = llvm::ConstantInt::get(IGM.IntPtrTy, 1);
+    return llvm::ConstantExpr::getGetElementPtr(nullptr, constant, bitConstant);
+  }
+
+  // Otherwise, create an accessor.
+  CanGenericSignature genericSig;
+  if (genericEnv)
+    genericSig = genericEnv->getGenericSignature()->getCanonicalSignature();
+
+  IRGenMangler mangler;
+  std::string symbolName =
+    mangler.mangleSymbolNameForKeyPathMetadata(
+      "keypath_get_type", genericSig, type,
+      ProtocolConformanceRef::forInvalid());
+
+  // TODO: Use the standard metadata accessor when there are no arguments
+  // and the metadata accessor is defined.
+  return emitGeneratorForKeyPath(IGM, symbolName, type,
+    IGM.TypeMetadataPtrTy,
+    genericEnv, requirements,
+    [&](IRGenFunction &IGF, CanType substType) {
+      auto ret = IGF.emitTypeMetadataRef(substType);
+      IGF.Builder.CreateRet(ret);
+    });
+};
 
 static llvm::Constant *
 emitWitnessTableGeneratorForKeyPath(IRGenModule &IGM,
@@ -1148,9 +1171,6 @@ IRGenModule::getAddrOfKeyPathPattern(KeyPathPattern *pattern,
     fields.addInt32(0);
   }
 
-  // Add the generic environment.
-  fields.addRelativeAddressOrNull(
-    getAddrOfGenericEnvironment(pattern->getGenericSignature()));
   // Store type references for the root and leaf.
   fields.addRelativeAddress(
     emitMetadataGeneratorForKeyPath(*this, rootTy, genericEnv, requirements));

branches/marcrasi-const-evaluator-part-2/lib/IRGen/GenProto.cpp

@@ -67,7 +67,6 @@
 #include "GenericRequirement.h"
 #include "IRGenDebugInfo.h"
 #include "IRGenFunction.h"
-#include "IRGenMangler.h"
 #include "IRGenModule.h"
 #include "MetadataPath.h"
 #include "MetadataRequest.h"
@@ -3420,58 +3419,3 @@ llvm::Value *irgen::emitProtocolDescriptorRef(IRGenFunction &IGF,
 
   return val;
 }
-
-llvm::Constant *IRGenModule::getAddrOfGenericEnvironment(
-                                                CanGenericSignature signature) {
-  if (!signature)
-    return nullptr;
-
-  IRGenMangler mangler;
-  auto symbolName = mangler.mangleSymbolNameForGenericEnvironment(signature);
-  return getAddrOfStringForMetadataRef(symbolName, /*alignment=*/0, false,
-      [&] (ConstantInitBuilder &builder) -> ConstantInitFuture {
-        /// Collect the cumulative count of parameters at each level.
-        llvm::SmallVector<uint16_t, 4> genericParamCounts;
-        unsigned curDepth = 0;
-        unsigned genericParamCount = 0;
-        for (const auto gp : signature->getGenericParams()) {
-          if (curDepth != gp->getDepth()) {
-            genericParamCounts.push_back(genericParamCount);
-            curDepth = gp->getDepth();
-          }
-
-          ++genericParamCount;
-        }
-        genericParamCounts.push_back(genericParamCount);
-
-        auto flags = GenericEnvironmentFlags()
-          .withNumGenericParameterLevels(genericParamCounts.size())
-          .withNumGenericRequirements(signature->getRequirements().size());
-
-        ConstantStructBuilder fields = builder.beginStruct();
-        fields.setPacked(true);
-
-        // Flags
-        fields.addInt32(flags.getIntValue());
-
-        // Parameter counts.
-        for (auto count : genericParamCounts) {
-          fields.addInt16(count);
-        }
-
-        // Generic parameters.
-        signature->forEachParam([&](GenericTypeParamType *param,
-                                    bool canonical) {
-          fields.addInt(Int8Ty,
-                        GenericParamDescriptor(GenericParamKind::Type,
-                                               canonical,
-                                               false)
-                          .getIntValue());
-        });
-
-        // Generic requirements
-        irgen::addGenericRequirements(*this, fields, signature,
-                                      signature->getRequirements());
-        return fields.finishAndCreateFuture();
-      });
-}

branches/marcrasi-const-evaluator-part-2/lib/IRGen/IRGenMangler.cpp

@@ -294,11 +294,3 @@ std::string IRGenMangler::mangleSymbolNameForKeyPathMetadata(
     assert(conformance.isInvalid() && "Unknown protocol conformance");
   return finalize();
 }
-
-std::string IRGenMangler::mangleSymbolNameForGenericEnvironment(
-                                              CanGenericSignature genericSig) {
-  beginManglingWithoutPrefix();
-  Buffer << "generic environment ";
-  appendGenericSignature(genericSig);
-  return finalize();
-}

branches/marcrasi-const-evaluator-part-2/lib/IRGen/IRGenMangler.h

@@ -416,8 +416,6 @@ class IRGenMangler : public Mangle::ASTMangler {
                                            CanType type,
                                            ProtocolConformanceRef conformance);
 
-  std::string mangleSymbolNameForGenericEnvironment(
-                                                CanGenericSignature genericSig);
 protected:
   SymbolicMangling
   withSymbolicReferences(IRGenModule &IGM,

branches/marcrasi-const-evaluator-part-2/lib/IRGen/IRGenModule.h

@@ -1032,7 +1032,6 @@ class IRGenModule {
   ///
   /// \param symbolName The name of the symbol that describes the metadata
   /// being referenced.
-  /// \param alignment If non-zero, the alignment of the requested variable.
   /// \param shouldSetLowBit Whether to set the low bit of the result
   /// constant, which is used by some clients to indicate that the result is
   /// a mangled name.
@@ -1042,7 +1041,6 @@ class IRGenModule {
   /// \returns the address of the global variable describing this metadata.
   llvm::Constant *getAddrOfStringForMetadataRef(
       StringRef symbolName,
-      unsigned alignment,
       bool shouldSetLowBit,
       llvm::function_ref<ConstantInitFuture(ConstantInitBuilder &)> body);
 
@@ -1278,7 +1276,6 @@ private:                            \
   llvm::Constant *getAddrOfObjCModuleContextDescriptor();
   llvm::Constant *getAddrOfClangImporterModuleContextDescriptor();
   ConstantReference getAddrOfParentContextDescriptor(DeclContext *from);
-  llvm::Constant *getAddrOfGenericEnvironment(CanGenericSignature signature);
   llvm::Constant *getAddrOfProtocolRequirementsBaseDescriptor(
                                                   ProtocolDecl *proto);
   llvm::GlobalValue *defineProtocolRequirementsBaseDescriptor(

branches/marcrasi-const-evaluator-part-2/lib/IRGen/MetadataRequest.cpp

@@ -220,7 +220,6 @@ MetadataDependency MetadataDependencyCollector::finish(IRGenFunction &IGF) {
 
 llvm::Constant *IRGenModule::getAddrOfStringForMetadataRef(
     StringRef symbolName,
-    unsigned alignment,
     bool shouldSetLowBit,
     llvm::function_ref<ConstantInitFuture (ConstantInitBuilder &)> body) {
   // Call this to form the return value.
@@ -252,8 +251,7 @@ llvm::Constant *IRGenModule::getAddrOfStringForMetadataRef(
     llvm::GlobalValue::HiddenVisibility,
     llvm::GlobalValue::DefaultStorageClass})
   .to(var);
-  if (alignment)
-    var->setAlignment(alignment);
+  var->setAlignment(2);
   setTrueConstGlobal(var);
   var->setSection(getReflectionTypeRefSectionName());
 

branches/marcrasi-const-evaluator-part-2/lib/Migrator/CMakeLists.txt

@@ -48,7 +48,6 @@ add_swift_host_library(swiftMigrator STATIC
   FixitApplyDiagnosticConsumer.cpp
   Migrator.cpp
   MigrationState.cpp
-  OptionalTryMigratorPass.cpp
   RewriteBufferEditsReceiver.cpp
   LINK_LIBRARIES swiftSyntax swiftIDE)
 

branches/marcrasi-const-evaluator-part-2/lib/Migrator/Migrator.cpp

@@ -197,8 +197,6 @@ bool Migrator::performSyntacticPasses() {
 
   runAPIDiffMigratorPass(Editor, StartInstance->getPrimarySourceFile(),
                          getMigratorOptions());
-  runOptionalTryMigratorPass(Editor, StartInstance->getPrimarySourceFile(),
-                        getMigratorOptions());
 
   Edits.commit(Editor.getEdits());