Revert 15940: "Compilation type and state allocate an unnecessary Smi on v8::Script."

src/accessors.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 274 matching lines @@
 };
 
 
 //
 // Accessors::ScriptCompilationType
 //
 
 
 MaybeObject* Accessors::ScriptGetCompilationType(Object* object, void*) {
   Object* script = JSValue::cast(object)->value();
-  return Smi::FromInt(Script::cast(script)->compilation_type());
+  return Script::cast(script)->compilation_type();
 }
 
 
 const AccessorDescriptor Accessors::ScriptCompilationType = {
   ScriptGetCompilationType,
   IllegalSetter,
   0
 };
 
 
@@ skipping 75 matching lines @@
 // Accessors::ScriptGetEvalFromScriptPosition
 //
 
 
 MaybeObject* Accessors::ScriptGetEvalFromScriptPosition(Object* object, void*) {
   Script* raw_script = Script::cast(JSValue::cast(object)->value());
   HandleScope scope(raw_script->GetIsolate());
   Handle<Script> script(raw_script);
 
   // If this is not a script compiled through eval there is no eval position.
-  if (script->compilation_type() != Script::COMPILATION_TYPE_EVAL) {
+  int compilation_type = Smi::cast(script->compilation_type())->value();
+  if (compilation_type != Script::COMPILATION_TYPE_EVAL) {
     return script->GetHeap()->undefined_value();
   }
 
   // Get the function from where eval was called and find the source position
   // from the instruction offset.
   Handle<Code> code(SharedFunctionInfo::cast(
       script->eval_from_shared())->code());
   return Smi::FromInt(code->SourcePosition(code->instruction_start() +
                       script->eval_from_instructions_offset()->value()));
 }
@@ skipping 446 matching lines @@
   info->set_data(Smi::FromInt(index));
   Handle<Object> getter = v8::FromCData(&ModuleGetExport);
   Handle<Object> setter = v8::FromCData(&ModuleSetExport);
   info->set_getter(*getter);
   if (!(attributes & ReadOnly)) info->set_setter(*setter);
   return info;
 }
 
 
 } }  // namespace v8::internal