Merge SILFunction::Location into SILFunction::DebugScope::Loc.

NFC intended.

Author: adrian-prantl

include/swift/SIL/SILFunction.h

@@ -98,10 +98,6 @@ class SILFunction
   /// function references.
   BlockListType BlockList;
 
-  /// The SIL location of the function, which provides a link back to the AST.
-  /// The function only gets a location after it's been emitted.
-  Optional<SILLocation> Location;
-
   /// The declcontext of this function.
   DeclContext *DeclCtx;
 
@@ -437,20 +433,17 @@ class SILFunction
   ///          or is raw SIL (so that the mandatory passes still run).
   bool shouldOptimize() const;
 
-  /// Initialize the source location of the function.
-  void setLocation(SILLocation L) { Location = L; }
-
   /// Check if the function has a location.
   /// FIXME: All functions should have locations, so this method should not be
   /// necessary.
   bool hasLocation() const {
-    return Location.hasValue();
+    return DebugScope && !DebugScope->Loc.isNull();
   }
 
   /// Get the source location of the function.
   SILLocation getLocation() const {
-    assert(Location.hasValue());
-    return Location.getValue();
+    assert(DebugScope && "no scope/location");
+    return getDebugScope()->Loc;
   }
 
   /// Initialize the debug scope of the function.

lib/SIL/SILFunction.cpp

@@ -89,7 +89,6 @@ SILFunction::SILFunction(SILModule &Module, SILLinkage Linkage,
     LoweredType(LoweredType),
     // FIXME: Context params should be independent of the function type.
     ContextGenericParams(contextGenericParams),
-    Location(Loc),
     DeclCtx(DC),
     DebugScope(DebugScope),
     Bare(isBareSILFunction),

lib/SILGen/SILGen.cpp

@@ -488,10 +488,7 @@ void SILGenModule::preEmitFunction(SILDeclRef constant,
                          Types.getConstantInfo(constant).ContextGenericParams);
 
   // Create a debug scope for the function using astNode as source location.
-  F->setDebugScope(new (M) SILDebugScope(RegularLocation(astNode), F));
-
-  F->setLocation(Loc);
-
+  F->setDebugScope(new (M) SILDebugScope(Loc, F));
   F->setDeclContext(astNode);
 
   DEBUG(llvm::dbgs() << "lowering ";
@@ -881,12 +878,8 @@ SILFunction *SILGenModule::emitLazyGlobalInitializer(StringRef funcName,
                        makeModuleFragile
                            ? IsFragile
                            : IsNotFragile);
-  f->setDebugScope(
-      new (M) SILDebugScope(RegularLocation(binding->getInit(pbdEntry)), f));
-  f->setLocation(binding);
-
+  f->setDebugScope(new (M) SILDebugScope(RegularLocation(binding), f));
   SILGenFunction(*this, *f).emitLazyGlobalInitializer(binding, pbdEntry);
-
   f->verify();
 
   return f;

lib/Serialization/DeserializeSIL.cpp

@@ -461,8 +461,6 @@ SILFunction *SILDeserializer::readSILFunction(DeclID FID,
          "SILFunction to be deserialized starts being empty.");
 
   fn->setBare(IsBare);
-  if (!fn->hasLocation()) fn->setLocation(loc);
-
   const SILDebugScope *DS = fn->getDebugScope();
   if (!DS) {
     DS = new (SILMod) SILDebugScope(loc, fn);