libswift: bridge the MemoryBehavior enum instead of all the mayRead/Write instruction functions

Author: eeckstein

include/swift/SIL/SILBridging.h

@@ -119,6 +119,16 @@ typedef struct {
   SwiftObject obj;
 } BridgedMultiValueResult;
 
+// Must be in sync with SILInstruction::MemoryBehavior
+// TODO: do this less hacky.
+typedef enum {
+  NoneBehavior,
+  MayReadBehavior,
+  MayWriteBehavior,
+  MayReadWriteBehavior,
+  MayHaveSideEffectsBehavior
+} BridgedMemoryBehavior;
+
 typedef long SwiftInt;
 
 void registerBridgedClass(BridgedStringRef className, SwiftMetatype metatype);
@@ -166,10 +176,7 @@ OptionalBridgedInstruction SILInstruction_previous(BridgedInstruction inst);
 BridgedBasicBlock SILInstruction_getParent(BridgedInstruction inst);
 BridgedOperandArray SILInstruction_getOperands(BridgedInstruction inst);
 BridgedLocation SILInstruction_getLocation(BridgedInstruction inst);
-int SILInstruction_mayHaveSideEffects(BridgedInstruction inst);
-int SILInstruction_mayReadFromMemory(BridgedInstruction inst);
-int SILInstruction_mayWriteToMemory(BridgedInstruction inst);
-int SILInstruction_mayReadOrWriteMemory(BridgedInstruction inst);
+BridgedMemoryBehavior SILInstruction_getMemBehavior(BridgedInstruction inst);
 
 BridgedInstruction MultiValueInstResult_getParent(BridgedMultiValueResult result);
 SwiftInt MultipleValueInstruction_getNumResults(BridgedInstruction inst);

lib/SIL/Utils/SILBridging.cpp

@@ -326,17 +326,8 @@ BridgedLocation SILInstruction_getLocation(BridgedInstruction inst) {
   return *reinterpret_cast<BridgedLocation *>(&loc);
 }
 
-int SILInstruction_mayHaveSideEffects(BridgedInstruction inst) {
-  return castToInst(inst)->mayHaveSideEffects();
-}
-int SILInstruction_mayReadFromMemory(BridgedInstruction inst) {
-  return castToInst(inst)->mayReadFromMemory();
-}
-int SILInstruction_mayWriteToMemory(BridgedInstruction inst) {
-  return castToInst(inst)->mayWriteToMemory();
-}
-int SILInstruction_mayReadOrWriteMemory(BridgedInstruction inst) {
-  return castToInst(inst)->mayReadOrWriteMemory();
+BridgedMemoryBehavior SILInstruction_getMemBehavior(BridgedInstruction inst) {
+  return (BridgedMemoryBehavior)castToInst(inst)->getMemoryBehavior();
 }
 
 BridgedInstruction MultiValueInstResult_getParent(BridgedMultiValueResult result) {

libswift/Sources/SIL/Instruction.swift

@@ -46,17 +46,38 @@ public class Instruction : ListNode, CustomStringConvertible {
     return Location(bridgedLocation: SILInstruction_getLocation(bridged))
   }
 
+  public var mayTrap: Bool { false }
+
   final public var mayHaveSideEffects: Bool {
-    return SILInstruction_mayHaveSideEffects(bridged) != 0
+    return mayTrap || mayWriteToMemory
   }
+
   final public var mayReadFromMemory: Bool {
-    return SILInstruction_mayReadFromMemory(bridged) != 0
+    switch SILInstruction_getMemBehavior(bridged) {
+      case MayReadBehavior, MayReadWriteBehavior, MayHaveSideEffectsBehavior:
+        return true
+      default:
+        return false
+    }
   }
+
   final public var mayWriteToMemory: Bool {
-    return SILInstruction_mayWriteToMemory(bridged) != 0
+    switch SILInstruction_getMemBehavior(bridged) {
+      case MayWriteBehavior, MayReadWriteBehavior, MayHaveSideEffectsBehavior:
+        return true
+      default:
+        return false
+    }
   }
+
   final public var mayReadOrWriteMemory: Bool {
-    return SILInstruction_mayReadOrWriteMemory(bridged) != 0
+    switch SILInstruction_getMemBehavior(bridged) {
+      case MayReadBehavior, MayWriteBehavior, MayReadWriteBehavior,
+           MayHaveSideEffectsBehavior:
+        return true
+      default:
+        return false
+    }
   }
 
   public var bridged: BridgedInstruction {
@@ -143,6 +164,8 @@ final public class UnimplementedInstruction : Instruction {
 final public class CondFailInst : Instruction {
   public var condition: Value { operands[0].value }
 
+  public override var mayTrap: Bool { true }
+
   public var message: String { CondFailInst_getMessage(bridged).string }
 }