| Index: runtime/vm/object.cc
 | 
| ===================================================================
 | 
| --- runtime/vm/object.cc	(revision 41393)
 | 
| +++ runtime/vm/object.cc	(working copy)
 | 
| @@ -10789,7 +10789,7 @@
 | 
|        return "SavedEntryCtx";
 | 
|        break;
 | 
|      case RawLocalVarDescriptors::kSavedCurrentContext:
 | 
| -      return "SavedCurrentCtx";
 | 
| +      return "CurrentCtx";
 | 
|        break;
 | 
|      default:
 | 
|        UNREACHABLE();
 | 
| @@ -13493,15 +13493,12 @@
 | 
|  }
 | 
|  
 | 
|  
 | 
| -bool Instance::IsCallable(Function* function, Context* context) const {
 | 
| +bool Instance::IsCallable(Function* function) const {
 | 
|    Class& cls = Class::Handle(clazz());
 | 
|    if (cls.IsSignatureClass()) {
 | 
|      if (function != NULL) {
 | 
|        *function = Closure::function(*this);
 | 
|      }
 | 
| -    if (context != NULL) {
 | 
| -      *context = Closure::context(*this);
 | 
| -    }
 | 
|      return true;
 | 
|    }
 | 
|    // Try to resolve a "call" method.
 | 
| @@ -13512,9 +13509,6 @@
 | 
|        if (function != NULL) {
 | 
|          *function = call_function.raw();
 | 
|        }
 | 
| -      if (context != NULL) {
 | 
| -        *context = Isolate::Current()->object_store()->empty_context();
 | 
| -      }
 | 
|        return true;
 | 
|      }
 | 
|      cls = cls.SuperClass();
 | 
| 
 |