Shut up Windows and ASAN

TBR=dcarney@chromium.org
BUG=

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

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

diff --git a/src/types-inl.h b/src/types-inl.h
index d6c69c4..2c80503 100644 (file)
--- a/src/types-inl.h
+++ b/src/types-inl.h
@@ -130,15 +130,13 @@ void ZoneTypeConfig::struct_shrink(Struct* structured, int length) {
 
 // static
 int ZoneTypeConfig::struct_tag(Struct* structured) {
-  int tag = reinterpret_cast<intptr_t>(structured[0]);
-  return tag;
+  return static_cast<int>(reinterpret_cast<intptr_t>(structured[0]));
 }
 
 
 // static
 int ZoneTypeConfig::struct_length(Struct* structured) {
-  int length = reinterpret_cast<intptr_t>(structured[1]);
-  return length;
+  return static_cast<int>(reinterpret_cast<intptr_t>(structured[1]));
 }
 
 

diff --git a/test/cctest/test-types.cc b/test/cctest/test-types.cc
index e45a1c7..445a9e1 100644 (file)
--- a/test/cctest/test-types.cc
+++ b/test/cctest/test-types.cc
@@ -176,10 +176,10 @@ class Types {
 
 // Testing auxiliaries (breaking the Type abstraction).
 struct ZoneRep {
-  struct Struct { int tag; int length; void* args[1]; };
+  typedef void* Struct;
 
   static bool IsStruct(Type* t, int tag) {
-    return !IsBitset(t) && AsStruct(t)->tag == tag;
+    return !IsBitset(t) && reinterpret_cast<intptr_t>(AsStruct(t)[0]) == tag;
   }
   static bool IsBitset(Type* t) { return reinterpret_cast<intptr_t>(t) & 1; }
   static bool IsClass(Type* t) { return IsStruct(t, 0); }
@@ -193,15 +193,17 @@ struct ZoneRep {
     return static_cast<int>(reinterpret_cast<intptr_t>(t) >> 1);
   }
   static Map* AsClass(Type* t) {
-    return *static_cast<Map**>(AsStruct(t)->args[1]);
+    return *static_cast<Map**>(AsStruct(t)[3]);
   }
   static Object* AsConstant(Type* t) {
-    return *static_cast<Object**>(AsStruct(t)->args[1]);
+    return *static_cast<Object**>(AsStruct(t)[3]);
   }
   static Struct* AsUnion(Type* t) {
     return AsStruct(t);
   }
-  static int Length(Struct* structured) { return structured->length; }
+  static int Length(Struct* structured) {
+    return static_cast<int>(reinterpret_cast<intptr_t>(structured[1]));
+  }
 
   static Zone* ToRegion(Zone* zone, Isolate* isolate) { return zone; }
 };