Revert "Optimizer/IRGen: allow enums in static initializers of globals"

SwiftCompilerSources/Sources/Optimizer/InstructionSimplification/CMakeLists.txt

@@ -16,11 +16,9 @@ swift_compiler_sources(Optimizer
   SimplifyDebugStep.swift
   SimplifyDestructure.swift
   SimplifyGlobalValue.swift
-  SimplifyInitEnumDataAddr.swift
   SimplifyLoad.swift
   SimplifyPartialApply.swift
   SimplifyStrongRetainRelease.swift
   SimplifyStructExtract.swift
   SimplifyTupleExtract.swift
-  SimplifyUncheckedEnumData.swift
-  SimplifyValueToBridgeObject.swift)
+  SimplifyUncheckedEnumData.swift)

SwiftCompilerSources/Sources/Optimizer/PassManager/Context.swift

@@ -168,7 +168,8 @@ struct FunctionPassContext : MutatingContext {
   var notifyInstructionChanged: (Instruction) -> () { return { inst in } }
 
   func continueWithNextSubpassRun(for inst: Instruction? = nil) -> Bool {
-    return _bridged.continueWithNextSubpassRun(inst.bridged)
+    let bridgedInst = OptionalBridgedInstruction(inst?.bridged.obj)
+    return _bridged.continueWithNextSubpassRun(bridgedInst)
   }
 
   func createSimplifyContext(preserveDebugInfo: Bool, notifyInstructionChanged: @escaping (Instruction) -> ()) -> SimplifyContext {

SwiftCompilerSources/Sources/SIL/Builder.swift

@@ -113,7 +113,7 @@ public struct Builder {
     return notifyNew(cast.getAs(UpcastInst.self))
   }
 
-  public func createLoad(fromAddress: Value, ownership: LoadInst.Ownership) -> LoadInst {
+  public func createLoad(fromAddress: Value, ownership: LoadInst.LoadOwnership) -> LoadInst {
     let load = bridged.createLoad(fromAddress.bridged, ownership.rawValue)
     return notifyNew(load.getAs(LoadInst.self))
   }
@@ -184,12 +184,6 @@ public struct Builder {
     let ued = bridged.createUncheckedEnumData(enumVal.bridged, caseIndex, resultType.bridged)
     return notifyNew(ued.getAs(UncheckedEnumDataInst.self))
   }
-
-  public func createEnum(caseIndex: Int, payload: Value?, enumType: Type) -> EnumInst {
-    let enumInst = bridged.createEnum(caseIndex, payload.bridged, enumType.bridged)
-    return notifyNew(enumInst.getAs(EnumInst.self))
-  }
-
   @discardableResult
   public func createSwitchEnum(enum enumVal: Value,
                                cases: [(Int, BasicBlock)],
@@ -231,23 +225,20 @@ public struct Builder {
     return notifyNew(bridged.createGlobalValue(global.bridged).getAs(GlobalValueInst.self))
   }
 
+  @discardableResult
   public func createStruct(type: Type, elements: [Value]) -> StructInst {
     let structInst = elements.withBridgedValues { valuesRef in
       return bridged.createStruct(type.bridged, valuesRef)
     }
     return notifyNew(structInst.getAs(StructInst.self))
   }
 
+  @discardableResult
   public func createTuple(type: Type, elements: [Value]) -> TupleInst {
     let tuple = elements.withBridgedValues { valuesRef in
       return bridged.createTuple(type.bridged, valuesRef)
     }
     return notifyNew(tuple.getAs(TupleInst.self))
   }
 
-  @discardableResult
-  public func createStore(source: Value, destination: Value, ownership: StoreInst.Ownership) -> StoreInst {
-    let store = bridged.createStore(source.bridged, destination.bridged, ownership.rawValue)
-    return notifyNew(store.getAs(StoreInst.self))
-  }
 }

SwiftCompilerSources/Sources/SIL/GlobalVariable.swift

@@ -123,7 +123,6 @@ extension Instruction {
       return !fri.referencedFunction.isAsync
     case is StructInst,
          is TupleInst,
-         is EnumInst,
          is IntegerLiteralInst,
          is FloatLiteralInst,
          is ObjectInst,

SwiftCompilerSources/Sources/SIL/Instruction.swift

@@ -148,12 +148,6 @@ extension OptionalBridgedInstruction {
   }
 }
 
-extension Optional where Wrapped == Instruction {
-  public var bridged: OptionalBridgedInstruction {
-    OptionalBridgedInstruction(self?.bridged.obj)
-  }
-}
-
 public class SingleValueInstruction : Instruction, Value {
   final public var definingInstruction: Instruction? { self }
 
@@ -228,23 +222,11 @@ extension StoringInstruction {
 
 final public class StoreInst : Instruction, StoringInstruction {
   // must match with enum class StoreOwnershipQualifier
-  public enum Ownership: Int {
+  public enum StoreOwnership: Int {
     case unqualified = 0, initialize = 1, assign = 2, trivial = 3
-
-    public init(for type: Type, in function: Function, initialize: Bool) {
-      if function.hasOwnership {
-        if type.isTrivial(in: function) {
-          self = .trivial
-        } else {
-          self = initialize ? .initialize : .assign
-        }
-      } else {
-        self = .unqualified
-      }
-    }
   }
-  public var destinationOwnership: Ownership {
-    Ownership(rawValue: bridged.StoreInst_getStoreOwnership())!
+  public var destinationOwnership: StoreOwnership {
+    StoreOwnership(rawValue: bridged.StoreInst_getStoreOwnership())!
   }
 }
 
@@ -325,7 +307,6 @@ final public class DestroyAddrInst : Instruction, UnaryInstruction {
 }
 
 final public class InjectEnumAddrInst : Instruction, UnaryInstruction, EnumInstruction {
-  public var `enum`: Value { operand.value }
   public var caseIndex: Int { bridged.InjectEnumAddrInst_caseIndex() }
 }
 
@@ -370,11 +351,11 @@ final public class LoadInst : SingleValueInstruction, UnaryInstruction {
   public var address: Value { operand.value }
 
   // must match with enum class LoadOwnershipQualifier
-  public enum Ownership: Int {
+  public enum LoadOwnership: Int {
     case unqualified = 0, take = 1, copy = 2, trivial = 3
   }
-  public var ownership: Ownership {
-    Ownership(rawValue: bridged.LoadInst_getLoadOwnership())!
+  public var ownership: LoadOwnership {
+    LoadOwnership(rawValue: bridged.LoadInst_getLoadOwnership())!
   }
 }
 
@@ -407,10 +388,6 @@ final public class UncheckedAddrCastInst : SingleValueInstruction, UnaryInstruct
   public var fromAddress: Value { operand.value }
 }
 
-final public class UncheckedTrivialBitCastInst : SingleValueInstruction, UnaryInstruction {
-  public var fromValue: Value { operand.value }
-}
-
 final public
 class RawPointerToRefInst : SingleValueInstruction, UnaryInstruction {
   public var pointer: Value { operand.value }
@@ -649,9 +626,7 @@ final public
 class ObjCMetatypeToObjectInst : SingleValueInstruction, UnaryInstruction {}
 
 final public
-class ValueToBridgeObjectInst : SingleValueInstruction, UnaryInstruction {
-  public var value: Value { return operand.value }
-}
+class ValueToBridgeObjectInst : SingleValueInstruction, UnaryInstruction {}
 
 final public
 class MarkDependenceInst : SingleValueInstruction {

SwiftCompilerSources/Sources/SIL/Registration.swift

@@ -77,7 +77,6 @@ public func registerSILClasses() {
   register(UpcastInst.self)
   register(UncheckedRefCastInst.self)
   register(UncheckedAddrCastInst.self)
-  register(UncheckedTrivialBitCastInst.self)
   register(MarkMustCheckInst.self)
   register(ObjectInst.self)
   register(RawPointerToRefInst.self)

SwiftCompilerSources/Sources/SIL/Type.swift

@@ -31,10 +31,6 @@ public struct Type : CustomStringConvertible, NoReflectionChildren {
     return !bridged.isNonTrivialOrContainsRawPointer(function.bridged.getFunction())
   }
 
-  public func isLoadable(in function: Function) -> Bool {
-    return bridged.isLoadable(function.bridged.getFunction())
-  }
-
   public func isReferenceCounted(in function: Function) -> Bool {
     return bridged.isReferenceCounted(function.bridged.getFunction())
   }

SwiftCompilerSources/Sources/SIL/Value.swift

@@ -204,9 +204,3 @@ final class PlaceholderValue : Value {
 extension OptionalBridgedValue {
   public var value: Value? { obj.getAs(AnyObject.self) as? Value }
 }
-
-extension Optional where Wrapped == Value {
-  public var bridged: OptionalBridgedValue {
-    OptionalBridgedValue(obj: self?.bridged.obj)
-  }
-}

include/swift/SIL/SILBridging.h

@@ -88,12 +88,6 @@ struct BridgedValue {
 
 struct OptionalBridgedValue {
   OptionalSwiftObject obj;
-
-  swift::SILValue getSILValue() const {
-    if (obj)
-      return static_cast<swift::ValueBase *>(obj);
-    return swift::SILValue();
-  }
 };
 
 inline swift::ValueOwnershipKind castToOwnership(BridgedValue::Ownership ownership) {
@@ -1179,14 +1173,6 @@ struct BridgedBuilder{
                                               en->getType().getEnumElement(caseIdx), resultType)};
   }
 
-  SWIFT_IMPORT_UNSAFE
-  BridgedInstruction createEnum(SwiftInt caseIdx, OptionalBridgedValue payload,
-                                swift::SILType resultType) const {
-    swift::EnumElementDecl *caseDecl = resultType.getEnumElement(caseIdx);
-    swift::SILValue pl = payload.getSILValue();
-    return {builder().createEnum(regularLoc(), pl, caseDecl, resultType)};
-  }
-
   SWIFT_IMPORT_UNSAFE
   BridgedInstruction createBranch(BridgedBasicBlock destBlock, BridgedValueArray arguments) const {
     llvm::SmallVector<swift::SILValue, 16> argValues;
@@ -1226,13 +1212,6 @@ struct BridgedBuilder{
     llvm::SmallVector<swift::SILValue, 16> elementValues;
     return {builder().createTuple(regularLoc(), type, elements.getValues(elementValues))};
   }
-
-  SWIFT_IMPORT_UNSAFE
-  BridgedInstruction createStore(BridgedValue src, BridgedValue dst,
-                                 SwiftInt ownership) const {
-    return {builder().createStore(regularLoc(), src.getSILValue(), dst.getSILValue(),
-                                  (swift::StoreOwnershipQualifier)ownership)};
-  }
 };
 
 // AST bridging

include/swift/SIL/SILType.h

@@ -346,8 +346,6 @@ class SILType {
     return !isAddressOnly(F);
   }
 
-  bool isLoadable(const SILFunction *f) const { return isLoadable(*f); }
-
   /// True if either:
   /// 1) The type, or the referenced type of an address type, is loadable.
   /// 2) The SIL Module conventions uses lowered addresses