languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-22 21:23:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compiler errors that seem to show up in the Android build under mojo/sky

Browse source 
../../dart/runtime/vm/compiler.cc: In static member function 'static dart::RawError* dart::Compiler::Compile(const dart::Library&, const dart::Script&)':
../../dart/runtime/vm/compiler.cc:181:18: error: variable 'isolate' might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered]
   Isolate* const isolate = Isolate::Current();
                  ^
../../dart/runtime/vm/compiler.cc: In static member function 'static dart::RawObject* dart::Compiler::EvaluateStaticInitializer(const dart::Field&)':
../../dart/runtime/vm/compiler.cc:1145:18: error: variable 'isolate' might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered]
   Isolate* const isolate = Isolate::Current();
                  ^

Review URL: https://codereview.chromium.org//1050083003

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@44850 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
asiva@google.com 2015-04-01 23:10:56 +00:00
parent b5ec6bb9b6
commit 5989674640
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
runtime/vm/compiler.cc
View file

@ -178,10 +178,10 @@ DEFINE_RUNTIME_ENTRY(CompileFunction, 1) {
RawError* Compiler::Compile(const Library& library, const Script& script) {
Isolate* const isolate = Isolate::Current();
StackZone zone(isolate);
LongJumpScope jump;
if (setjmp(*jump.Set()) == 0) {
Isolate* const isolate = Isolate::Current();
StackZone zone(isolate);
if (FLAG_trace_compiler) {
const String& script_url = String::Handle(script.url());
// TODO(iposva): Extract script kind.
@ -192,6 +192,8 @@ RawError* Compiler::Compile(const Library& library, const Script& script) {
Parser::ParseCompilationUnit(library, script);
return Error::null();
} else {
Isolate* const isolate = Isolate::Current();
StackZone zone(isolate);
Error& error = Error::Handle();
error = isolate->object_store()->sticky_error();
isolate->object_store()->clear_sticky_error();
@ -291,9 +293,9 @@ RawError* Compiler::CompileClass(const Class& cls) {
GrowableObjectArray::Handle(isolate, GrowableObjectArray::New(4));
// Parse the class and all the interfaces it implements and super classes.
StackZone zone(isolate);
LongJumpScope jump;
if (setjmp(*jump.Set()) == 0) {
StackZone zone(isolate);
if (FLAG_trace_compiler) {
ISL_Print("Compiling Class %s '%s'\n", "", cls.ToCString());
}
@ -352,7 +354,8 @@ RawError* Compiler::CompileClass(const Class& cls) {
parse_class.reset_is_marked_for_parsing();
}
}
Isolate* const isolate = Isolate::Current();
StackZone zone(isolate);
Error& error = Error::Handle(isolate);
error = isolate->object_store()->sticky_error();
isolate->object_store()->clear_sticky_error();
@ -964,12 +967,12 @@ static RawError* CompileFunctionHelper(CompilationPipeline* pipeline,
const Function& function,
bool optimized,
intptr_t osr_id) {
Thread* const thread = Thread::Current();
Isolate* const isolate = thread->isolate();
StackZone stack_zone(isolate);
Zone* const zone = stack_zone.GetZone();
LongJumpScope jump;
if (setjmp(*jump.Set()) == 0) {
Thread* const thread = Thread::Current();
Isolate* const isolate = thread->isolate();
StackZone stack_zone(isolate);
Zone* const zone = stack_zone.GetZone();
TIMERSCOPE(isolate, time_compilation);
Timer per_compile_timer(FLAG_trace_compiler, "Compilation time");
per_compile_timer.Start();
@ -1032,6 +1035,9 @@ static RawError* CompileFunctionHelper(CompilationPipeline* pipeline,
}
return Error::null();
} else {
Thread* const thread = Thread::Current();
Isolate* const isolate = thread->isolate();
StackZone stack_zone(isolate);
Error& error = Error::Handle();
// We got an error during compilation.
error = isolate->object_store()->sticky_error();
@ -1065,7 +1071,6 @@ RawError* Compiler::CompileOptimizedFunction(Thread* thread,
// This is only used from unit tests.
RawError* Compiler::CompileParsedFunction(
ParsedFunction* parsed_function) {
Isolate* const isolate = Isolate::Current();
LongJumpScope jump;
if (setjmp(*jump.Set()) == 0) {
// Non-optimized code generator.
@ -1079,6 +1084,7 @@ RawError* Compiler::CompileParsedFunction(
}
return Error::null();
} else {
Isolate* const isolate = Isolate::Current();
Error& error = Error::Handle();
// We got an error during compilation.
error = isolate->object_store()->sticky_error();
@ -1142,10 +1148,10 @@ RawObject* Compiler::EvaluateStaticInitializer(const Field& field) {
// The VM sets the field's value to transiton_sentinel prior to
// evaluating the initializer value.
ASSERT(field.value() == Object::transition_sentinel().raw());
Isolate* const isolate = Isolate::Current();
StackZone zone(isolate);
LongJumpScope jump;
if (setjmp(*jump.Set()) == 0) {
Isolate* const isolate = Isolate::Current();
StackZone zone(isolate);
ParsedFunction* parsed_function =
Parser::ParseStaticFieldInitializer(field);
@ -1163,6 +1169,8 @@ RawObject* Compiler::EvaluateStaticInitializer(const Field& field) {
DartEntry::InvokeFunction(initializer, Object::empty_array()));
return result.raw();
} else {
Isolate* const isolate = Isolate::Current();
StackZone zone(isolate);
const Error& error =
Error::Handle(isolate, isolate->object_store()->sticky_error());
isolate->object_store()->clear_sticky_error();
@ -1175,10 +1183,9 @@ RawObject* Compiler::EvaluateStaticInitializer(const Field& field) {
RawObject* Compiler::ExecuteOnce(SequenceNode* fragment) {
Thread* const thread = Thread::Current();
Isolate* const isolate = thread->isolate();
LongJumpScope jump;
if (setjmp(*jump.Set()) == 0) {
Thread* const thread = Thread::Current();
if (FLAG_trace_compiler) {
ISL_Print("compiling expression: ");
AstPrinter::PrintNode(fragment);
@ -1228,6 +1235,8 @@ RawObject* Compiler::ExecuteOnce(SequenceNode* fragment) {
DartEntry::InvokeFunction(func, Object::empty_array()));
return result.raw();
} else {
Thread* const thread = Thread::Current();
Isolate* const isolate = thread->isolate();
const Object& result =
PassiveObject::Handle(isolate->object_store()->sticky_error());
isolate->object_store()->clear_sticky_error();