Merge pull request #13251 from compnerd/qual-cast

swift-ci · web-flow · commit 932a4804ab00 · 2017-12-04T11:46:37.000-08:00
diff --git a/tools/SourceKit/include/SourceKit/Support/ThreadSafeRefCntPtr.h b/tools/SourceKit/include/SourceKit/Support/ThreadSafeRefCntPtr.h
@@ -120,7 +120,8 @@ class ThreadSafeRefCntPtr : ThreadSafeRefCntPtrImpl {
   }
 
   operator llvm::IntrusiveRefCntPtr<T>() const {
-    llvm::sys::ScopedLock L(*getMutex((void*)this));
+    llvm::sys::ScopedLock L(*getMutex(
+        reinterpret_cast<void *>(const_cast<ThreadSafeRefCntPtr *>(this))));
     llvm::IntrusiveRefCntPtr<T> Ref(Obj.load());
     return Ref;
   }

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,8 @@ class ThreadSafeRefCntPtr : ThreadSafeRefCntPtrImpl {`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`operator llvm::IntrusiveRefCntPtr<T>() const {`
`123`		`- llvm::sys::ScopedLock L(getMutex((void)this));`
	`123`	`+ llvm::sys::ScopedLock L(*getMutex(`
	`124`	`+ reinterpret_cast<void >(const_cast<ThreadSafeRefCntPtr >(this))));`
`124`	`125`	`llvm::IntrusiveRefCntPtr<T> Ref(Obj.load());`
`125`	`126`	`return Ref;`
`126`	`127`	`}`