SIL: Optimization remarks can take SILType by value

No need to pass a pointer to SILType; it is a pointer-sized value itself.

Author: slavapestov

include/swift/SIL/OptimizationRemark.h

@@ -50,7 +50,8 @@ struct Argument {
   Argument(StringRef Key, unsigned long long N);
 
   Argument(StringRef Key, SILFunction *F);
-  Argument(StringRef Key, SILType *Ty);
+  Argument(StringRef Key, SILType Ty);
+  Argument(StringRef Key, CanType Ty);
 };
 
 /// Shorthand to insert named-value pairs.

lib/SIL/OptimizationRemark.cpp

@@ -58,9 +58,14 @@ Argument::Argument(StringRef Key, SILFunction *F)
         Loc = F->getLocation().getSourceLoc();
 }
 
-Argument::Argument(StringRef Key, SILType *Ty) : Key(Key) {
+Argument::Argument(StringRef Key, SILType Ty) : Key(Key) {
   llvm::raw_string_ostream OS(Val);
-  Ty->print(OS);
+  Ty.print(OS);
+}
+
+Argument::Argument(StringRef Key, CanType Ty) : Key(Key) {
+  llvm::raw_string_ostream OS(Val);
+  Ty.print(OS);
 }
 
 template <typename DerivedT> std::string Remark<DerivedT>::getMsg() const {

lib/SILOptimizer/Transforms/SpeculativeDevirtualizer.cpp

@@ -535,7 +535,7 @@ static bool tryToSpeculateTarget(FullApplySite AI, ClassHierarchyAnalysis *CHA,
         RemarkPassed R("PartialSpecDevirt", *AI.getInstruction());
         R << "Partially devirtualized call with run-time checks for "
           << NV("NumSubTypesChecked", Subs.size()) << " subclasses of "
-          << NV("ClassType", &ClassType);
+          << NV("ClassType", ClassType);
         if (NotHandledSubsNum)
           R << ", number of subclasses not devirtualized: "
             << NV("NotHandledSubsNum", NotHandledSubsNum);
@@ -549,7 +549,7 @@ static bool tryToSpeculateTarget(FullApplySite AI, ClassHierarchyAnalysis *CHA,
   auto RB = [&]() {
     return RemarkPassed("SpecDevirt", *AI.getInstruction())
            << "Devirtualized call with run-time checks for the derived classes "
-              "of " << NV("ClassType", &ClassType);
+              "of " << NV("ClassType", ClassType);
   };
 
   // At this point it is known that there is only one remaining method