From: ager@chromium.org <ager@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Tue, 28 Oct 2008 13:46:04 +0000 (+0000)
Subject: Change the order of two assignments, to make sure that the script type
X-Git-Tag: upstream/4.7.83~25096
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=44340e39c56ac322aa0984bc9cbadeac032feb51;p=platform%2Fupstream%2Fv8.git

Change the order of two assignments, to make sure that the script type
field is always initialized to a Smi before we get any GCs.

Review URL: http://codereview.chromium.org/8833

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@624 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---

diff --git a/src/factory.cc b/src/factory.cc
index 55af33df0..435f4c17d 100644
--- a/src/factory.cc
+++ b/src/factory.cc
@@ -138,8 +138,8 @@ Handle<Script> Factory::NewScript(Handle<String> source) {
   script->set_name(Heap::undefined_value());
   script->set_line_offset(Smi::FromInt(0));
   script->set_column_offset(Smi::FromInt(0));
-  script->set_wrapper(*Factory::NewProxy(0, TENURED));
   script->set_type(Smi::FromInt(SCRIPT_TYPE_NORMAL));
+  script->set_wrapper(*Factory::NewProxy(0, TENURED));
   return script;
 }
 
diff --git a/src/objects-inl.h b/src/objects-inl.h
index beb6c0e1a..3694e30df 100644
--- a/src/objects-inl.h
+++ b/src/objects-inl.h
@@ -382,7 +382,7 @@ bool Object::IsJSGlobalProxy() {
 bool Object::IsGlobalObject() {
   if (!IsHeapObject()) return false;
 
-  InstanceType type =  HeapObject::cast(this)->map()->instance_type();
+  InstanceType type = HeapObject::cast(this)->map()->instance_type();
   return type == JS_GLOBAL_OBJECT_TYPE ||
          type == JS_BUILTINS_OBJECT_TYPE;
 }