runtime/vm/code_generator_x64.cc - Issue 9958091: Add missing type checks for top level static initializers (issue 1980 and

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: runtime/vm/code_generator_x64.cc

Issue 9958091: Add missing type checks for top level static initializers (issue 1980 and (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/

Patch Set: Created 8 years, 9 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

Index: runtime/vm/code_generator_x64.cc

===================================================================

--- runtime/vm/code_generator_x64.cc (revision 6144)

+++ runtime/vm/code_generator_x64.cc (working copy)

@@ -714,10 +714,13 @@

const bool returns_null = node->value()->IsLiteralNode() &&

node->value()->AsLiteralNode()->literal().IsNull();

const RawFunction::Kind kind = parsed_function().function().kind();

- // Implicit getters do not need a type check at return.

- if (!returns_null &&

- (kind != RawFunction::kImplicitGetter) &&

- (kind != RawFunction::kConstImplicitGetter)) {

+ const bool is_implicit_getter =

+ (kind == RawFunction::kImplicitGetter) ||

+ (kind == RawFunction::kConstImplicitGetter);

+ const bool is_static = parsed_function().function().is_static();

+ // Implicit getters do not need a type check at return, unless they compute

+ // the initial value of a static field.

+ if (!returns_null && (is_static || !is_implicit_getter)) {

GenerateAssertAssignable(

node->id(),

node->value()->token_index(),

« no previous file with comments | « runtime/vm/code_generator_ia32.cc ('k') | runtime/vm/flow_graph_builder.cc » ('j') | no next file with comments »