---

yaml
---
r: 349043
b: refs/heads/master
c: 5e8c4ad
h: refs/heads/master
i:
  349041: 756b945
  349039: 2b2218b

Author: shahmishal

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5acc4175fdd7f447a653db205659a6be42468dbb
+refs/heads/master: 5e8c4ad494ef73aee7d86483b2b6789e82a530b5
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/SILOptimizer/Mandatory/OSLogOptimization.cpp

@@ -783,9 +783,9 @@ static ApplyInst *getAsOSLogMessageInit(SILInstruction *inst) {
   return nullptr;
 }
 
-/// Return true iff this function is a protocol witness for
-/// ExpressibleByStringInterpolation.init(stringInterpolation:) in OSLogMessage.
-bool isAutoGeneratedInitOfOSLogMessage(SILFunction &fun) {
+/// Return true iff the SIL function \c fun is a method of the \c OSLogMessage
+/// type.
+bool isMethodOfOSLogMessage(SILFunction &fun) {
   DeclContext *declContext = fun.getDeclContext();
   if (!declContext)
     return false;
@@ -818,11 +818,15 @@ class OSLogOptimization : public SILFunctionTransform {
       return;
     }
 
-    // Skip the auto-generated (transparent) witness method of OSLogMessage,
-    // which ends up invoking the OSLogMessage initializer:
-    // "oslog.message.init_interpolation" but without an interpolated
-    // string literal.
-    if (isAutoGeneratedInitOfOSLogMessage(fun)) {
+    // Skip methods of OSLogMessage type. This avoid unnecessary work and also
+    // avoids falsely diagnosing the auto-generated (transparent) witness method
+    // of OSLogMessage, which ends up invoking the OSLogMessage initializer:
+    // "oslog.message.init_interpolation" without an interpolated string
+    // literal that is expected by this pass.
+    // TODO: this check can be eliminated if there is a separate pass for
+    // diagnosing errors in the use of the OSLogMessage type, and this pass
+    // bails out when a use of the type is not optimizable.
+    if (isMethodOfOSLogMessage(fun)) {
       return;
     }
 

trunk/utils/update_checkout/update-checkout-config.json

@@ -53,7 +53,7 @@
         "swift-format": {
             "remote": { "id": "apple/swift-format" } },
         "llvm-project": {
-            "remote": { "id": "apple/llvm-project-v2" } }
+            "remote": { "id": "apple/llvm-project-v3" } }
     },
     "default-branch-scheme": "master",
     "branch-schemes": {