Merge pull request swiftlang#12451 from lattner/SILValue-getLoc

Author: swift-ci

include/swift/SIL/SILValue.h

@@ -271,6 +271,9 @@ class SILValue {
   /// false otherwise.
   explicit operator bool() const { return Value != nullptr; }
 
+  /// Get a location for this value.
+  SILLocation getLoc() const;
+
   /// Convert this SILValue into an opaque pointer like type. For use with
   /// PointerLikeTypeTraits.
   void *getOpaqueValue() const {

lib/IRGen/LoadableByAddress.cpp

@@ -37,21 +37,6 @@
 using namespace swift;
 using namespace swift::irgen;
 
-/// Utility to derive SILLocation.
-///
-/// TODO: This should be a common utility.
-static SILLocation getLocForValue(SILValue value) {
-  if (auto *instr = value->getDefiningInstruction()) {
-    return instr->getLoc();
-  }
-  if (auto *arg = dyn_cast<SILArgument>(value)) {
-    if (arg->getDecl())
-      return RegularLocation(const_cast<ValueDecl *>(arg->getDecl()));
-  }
-  // TODO: bbargs should probably use one of their operand locations.
-  return value->getFunction()->getLocation();
-}
-
 static GenericEnvironment *getGenericEnvironment(SILModule &Mod,
                                                  CanSILFunctionType loweredTy) {
   return loweredTy->getGenericSignature()->createGenericEnvironment();
@@ -903,7 +888,7 @@ void LoadableStorageAllocation::replaceLoadWithCopyAddr(
 
   SILBuilder allocBuilder(pass.F->begin()->begin());
   AllocStackInst *allocInstr =
-      allocBuilder.createAllocStack(getLocForValue(value), value->getType());
+      allocBuilder.createAllocStack(value.getLoc(), value->getType());
 
   SILBuilder outlinedBuilder(optimizableLoad);
   createOutlinedCopyCall(outlinedBuilder, value, allocInstr, pass);
@@ -1030,7 +1015,7 @@ void LoadableStorageAllocation::replaceLoadWithCopyAddrForModifiable(
 
   SILBuilder allocBuilder(pass.F->begin()->begin());
   AllocStackInst *allocInstr =
-      allocBuilder.createAllocStack(getLocForValue(value), value->getType());
+      allocBuilder.createAllocStack(value.getLoc(), value->getType());
 
   SILBuilder outlinedBuilder(unoptimizableLoad);
   createOutlinedCopyCall(outlinedBuilder, value, allocInstr, pass);
@@ -1402,7 +1387,7 @@ void LoadableStorageAllocation::allocateForArg(SILValue value) {
 
   SILBuilder allocBuilder(pass.F->begin()->begin());
   AllocStackInst *allocInstr =
-      allocBuilder.createAllocStack(getLocForValue(value), value->getType());
+      allocBuilder.createAllocStack(value.getLoc(), value->getType());
 
   LoadInst *loadCopy = nullptr;
   auto *applyOutlinedCopy =
@@ -1682,7 +1667,7 @@ static SILValue createCopyOfEnum(StructLoweringState &pass,
     value = allocInstr;
   }
   SILBuilder allocBuilder(pass.F->begin()->begin());
-  auto *allocInstr = allocBuilder.createAllocStack(getLocForValue(value), type);
+  auto *allocInstr = allocBuilder.createAllocStack(value.getLoc(), type);
 
   SILBuilder copyBuilder(orig);
   createOutlinedCopyCall(copyBuilder, value, allocInstr, pass);

lib/SIL/SILInstruction.cpp

@@ -895,7 +895,7 @@ SILInstruction::MemoryBehavior SILInstruction::getMemoryBehavior() const {
                                 : MemoryBehavior::MayHaveSideEffects;
 
     // Handle LLVM intrinsic functions.
-    const IntrinsicInfo & IInfo = BI->getIntrinsicInfo();
+    const IntrinsicInfo &IInfo = BI->getIntrinsicInfo();
     if (IInfo.ID != llvm::Intrinsic::not_intrinsic) {
       // Read-only.
       if (IInfo.hasAttribute(llvm::Attribute::ReadOnly) &&

lib/SIL/SILValue.cpp

@@ -110,6 +110,20 @@ const SILNode *SILNode::getCanonicalSILNodeSlowPath() const {
               static_cast<const ValueBase &>(*this)));
 }
 
+/// Get a location for this value.
+SILLocation SILValue::getLoc() const {
+  if (auto *instr = Value->getDefiningInstruction())
+    return instr->getLoc();
+
+  if (auto *arg = dyn_cast<SILArgument>(*this)) {
+    if (arg->getDecl())
+      return RegularLocation(const_cast<ValueDecl *>(arg->getDecl()));
+  }
+  // TODO: bbargs should probably use one of their operand locations.
+  return Value->getFunction()->getLocation();
+}
+
+
 //===----------------------------------------------------------------------===//
 //                             ValueOwnershipKind
 //===----------------------------------------------------------------------===//

lib/SILOptimizer/Mandatory/AddressLowering.cpp

@@ -474,21 +474,6 @@ unsigned OpaqueStorageAllocation::insertIndirectReturnArgs() {
   return argIdx;
 }
 
-/// Utility to derive SILLocation.
-/// 
-/// TODO: This should be a common utility.
-static SILLocation getLocForValue(SILValue value) {
-  if (auto *instr = value->getDefiningInstruction()) {
-    return instr->getLoc();
-  }
-  if (auto *arg = dyn_cast<SILArgument>(value)) {
-    if (arg->getDecl())
-      return RegularLocation(const_cast<ValueDecl *>(arg->getDecl()));
-  }
-  // TODO: bbargs should probably use one of their operand locations.
-  return value->getFunction()->getLocation();
-}
-
 /// Is this operand composing an aggregate from a subobject, or simply
 /// forwarding the operand's value to storage defined elsewhere?
 ///
@@ -587,7 +572,7 @@ void OpaqueStorageAllocation::allocateForValue(SILValue value,
   allocBuilder.setSILConventions(
       SILModuleConventions::getLoweredAddressConventions());
   AllocStackInst *allocInstr =
-      allocBuilder.createAllocStack(getLocForValue(value), value->getType());
+      allocBuilder.createAllocStack(value.getLoc(), value->getType());
 
   storage.storageAddress = allocInstr;