---

yaml
---
r: 348862
b: refs/heads/master
c: a57e6cc
h: refs/heads/master

Author: hamishknight

[refs]

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

trunk/lib/Sema/TypeCheckDecl.cpp

@@ -1437,10 +1437,8 @@ NeedsNewVTableEntryRequest::evaluate(Evaluator &evaluator,
   // base has a more general AST type, then we need a new entry. Note that an
   // abstraction change is OK; we don't want to add a whole new vtable entry
   // just because an @in parameter becomes @owned, or whatever.
-  auto isABICompatibleOverride = evaluateOrDefault(
-      evaluator,
-      IsABICompatibleOverrideRequest{const_cast<AbstractFunctionDecl *>(decl)},
-      false);
+  auto isABICompatibleOverride =
+      evaluateOrDefault(evaluator, IsABICompatibleOverrideRequest{decl}, false);
   return !isABICompatibleOverride;
 }