Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(213)

Unified Diff: lib/compiler/implementation/ssa/codegen.dart

Issue 10092012: Fix issue 2358: dart methods on native classes must also check if the current prototype has the met… (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « lib/compiler/implementation/native_handler.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/compiler/implementation/ssa/codegen.dart
===================================================================
--- lib/compiler/implementation/ssa/codegen.dart (revision 6616)
+++ lib/compiler/implementation/ssa/codegen.dart (working copy)
@@ -15,7 +15,27 @@
SsaOptimizedCodeGenerator codegen = new SsaOptimizedCodeGenerator(
compiler, work, parameters, parameterNames);
codegen.visitGraph(graph);
- return 'function($parameters) {\n${codegen.buffer}}';
+
+ FunctionElement element = work.element;
+ String code;
+ if (element.isInstanceMember()
+ && element.enclosingElement.isClass()
+ && element.enclosingElement.isNative()
+ && native.isOverriddenMethod(element,
+ element.enclosingElement,
+ compiler.emitter.nativeEmitter)) {
+ // Record that this method is overridden. In case of optional
+ // arguments, the emitter will generate stubs to handle them,
+ // and needs to know if the method is overridden.
+ compiler.emitter.nativeEmitter.overriddenMethods.add(element);
+ StringBuffer buffer = new StringBuffer();
+ native.generateMethodWithPrototypeCheckForElement(
+ compiler, buffer, element, '${codegen.buffer}', parameters);
+ code = buffer.toString();
+ } else {
+ code = codegen.buffer.toString();
+ }
+ return 'function($parameters) {\n$code}';
});
}
« no previous file with comments | « lib/compiler/implementation/native_handler.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698