Hide WasmModule.origin field behind readable accessors.

src/wasm/wasm-objects.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/wasm/wasm-objects.h"
 #include "src/utils.h"
 
 #include "src/assembler-inl.h"
 #include "src/base/iterator.h"
 #include "src/compiler/wasm-compiler.h"
@@ skipping 203 matching lines @@
     if (offset == static_cast<uint32_t>(offset_in_func)) return true;
   }
   return false;
 }
 #endif  // DEBUG
 
 }  // namespace
 
 Handle<WasmModuleObject> WasmModuleObject::New(
     Isolate* isolate, Handle<WasmCompiledModule> compiled_module) {
-  ModuleOrigin origin = compiled_module->module()->origin;
+  ModuleOrigin origin = compiled_module->module()->get_origin();
 
   Handle<JSObject> module_object;
   if (origin == ModuleOrigin::kWasmOrigin) {

[Mircea Trofin, 2017/03/24 22:25:15]

why not use the is_wasm() / is_asm_js() APIs here, too?

[Karl, 2017/03/24 22:41:40]

It is, look up at line 224.

[Mircea Trofin, 2017/03/24 22:43:42]

that's get_origin()

[Karl, 2017/03/24 22:51:17]

Ok. I see. I didn't read the usage well enough. Changing to use is_wasm() /
is_asm_js() methods.

     Handle<JSFunction> module_cons(
         isolate->native_context()->wasm_module_constructor());
     module_object = isolate->factory()->NewJSObject(module_cons);
     Handle<Symbol> module_sym(isolate->native_context()->wasm_module_sym());
     Object::SetProperty(module_object, module_sym, module_object, STRICT)
         .Check();
   } else {
     DCHECK(origin == ModuleOrigin::kAsmJsOrigin);
     Handle<Map> map = isolate->factory()->NewMap(
         JS_OBJECT_TYPE,
@@ skipping 339 matching lines @@
   }
   if (!asm_js_offset_table.is_null()) {
     arr->set(kAsmJsOffsetTable, *asm_js_offset_table);
   }
 
   DCHECK(WasmSharedModuleData::IsWasmSharedModuleData(*arr));
   return Handle<WasmSharedModuleData>::cast(arr);
 }
 
 bool WasmSharedModuleData::is_asm_js() {
-  bool asm_js = module()->origin == wasm::ModuleOrigin::kAsmJsOrigin;
+  bool asm_js = module()->is_asm_js();
   DCHECK_EQ(asm_js, script()->IsUserJavaScript());
   DCHECK_EQ(asm_js, has_asm_js_offset_table());
   return asm_js;
 }
 
 void WasmSharedModuleData::ReinitializeAfterDeserialization(
     Isolate* isolate, Handle<WasmSharedModuleData> shared) {
   DCHECK(shared->get(kModuleWrapper)->IsUndefined(isolate));
 #ifdef DEBUG
   // No BreakpointInfo objects should survive deserialization.
@@ skipping 617 matching lines @@
   if (!array->get(kWrapperInstanceObject)->IsWeakCell()) return false;
   Isolate* isolate = array->GetIsolate();
   if (!array->get(kNextInstanceWrapper)->IsUndefined(isolate) &&
       !array->get(kNextInstanceWrapper)->IsFixedArray())
     return false;
   if (!array->get(kPreviousInstanceWrapper)->IsUndefined(isolate) &&
       !array->get(kPreviousInstanceWrapper)->IsFixedArray())
     return false;
   return true;
 }