[v8-dev] [v8] r21532 committed - Remove cpp hack to avoid link failures on Windows...

[codesite-noreply via v8-dev]

Revision: 21532
Author:   rossb...@chromium.org
Date:     Tue May 27 14:26:32 2014 UTC
Log:      Remove cpp hack to avoid link failures on Windows
TBR=yang...@chromium.org
BUG=

Review URL: https://codereview.chromium.org/298133005
http://code.google.com/p/v8/source/detail?r=21532

Modified:
 /branches/bleeding_edge/src/types.h
 /branches/bleeding_edge/test/cctest/test-types.cc

=======================================
--- /branches/bleeding_edge/src/types.h Tue May 27 13:52:31 2014 UTC
+++ /branches/bleeding_edge/src/types.h Tue May 27 14:26:32 2014 UTC
@@ -469,7 +469,7 @@

 template<class Config>
 class TypeImpl<Config>::BitsetType : public TypeImpl<Config> {
- private:
+ protected:
   friend class TypeImpl<Config>;

   enum {
=======================================
--- /branches/bleeding_edge/test/cctest/test-types.cc	Tue May 27 13:52:31  
2014 UTC
+++ /branches/bleeding_edge/test/cctest/test-types.cc	Tue May 27 14:26:32  
2014 UTC
@@ -27,13 +27,8 @@

 #include <vector>

-#define private public  /* To test private methods :) */
-#define protected public
+#include "cctest.h"
 #include "types.h"
-#undef private
-#undef protected
-
-#include "cctest.h"
 #include "utils/random-number-generator.h"

 using namespace v8::internal;
@@ -76,6 +71,13 @@
   }

   static Zone* ToRegion(Zone* zone, Isolate* isolate) { return zone; }
+
+  struct BitsetType : Type::BitsetType {
+    using Type::BitsetType::New;
+    using Type::BitsetType::Glb;
+    using Type::BitsetType::Lub;
+    using Type::BitsetType::InherentLub;
+  };
 };


@@ -108,6 +110,16 @@
   static int Length(Struct* structured) { return structured->length() - 1;  
}

   static Isolate* ToRegion(Zone* zone, Isolate* isolate) { return isolate;  
}
+
+  struct BitsetType : HeapType::BitsetType {
+    using HeapType::BitsetType::New;
+    using HeapType::BitsetType::Glb;
+    using HeapType::BitsetType::Lub;
+    using HeapType::BitsetType::InherentLub;
+    static int Glb(Handle<HeapType> type) { return Glb(*type); }
+    static int Lub(Handle<HeapType> type) { return Lub(*type); }
+    static int InherentLub(Handle<HeapType> type) { return  
InherentLub(*type); }
+  };
 };


@@ -739,31 +751,36 @@
     // Ordering: (T->BitsetGlb())->Is(T->BitsetLub())
     for (TypeIterator it = T.types.begin(); it != T.types.end(); ++it) {
       TypeHandle type = *it;
-      TypeHandle glb = Type::BitsetType::New(type->BitsetGlb(),  
T.region());
-      TypeHandle lub = Type::BitsetType::New(type->BitsetLub(),  
T.region());
+      TypeHandle glb =
+          Rep::BitsetType::New(Rep::BitsetType::Glb(type), T.region());
+      TypeHandle lub =
+          Rep::BitsetType::New(Rep::BitsetType::Lub(type), T.region());
       CHECK(glb->Is(lub));
     }

     // Lower bound: (T->BitsetGlb())->Is(T)
     for (TypeIterator it = T.types.begin(); it != T.types.end(); ++it) {
       TypeHandle type = *it;
-      TypeHandle glb = Type::BitsetType::New(type->BitsetGlb(),  
T.region());
+      TypeHandle glb =
+          Rep::BitsetType::New(Rep::BitsetType::Glb(type), T.region());
       CHECK(glb->Is(type));
     }

     // Upper bound: T->Is(T->BitsetLub())
     for (TypeIterator it = T.types.begin(); it != T.types.end(); ++it) {
       TypeHandle type = *it;
-      TypeHandle lub = Type::BitsetType::New(type->BitsetLub(),  
T.region());
+      TypeHandle lub =
+          Rep::BitsetType::New(Rep::BitsetType::Lub(type), T.region());
       CHECK(type->Is(lub));
     }

     // Inherent bound: (T->BitsetLub())->Is(T->InherentBitsetLub())
     for (TypeIterator it = T.types.begin(); it != T.types.end(); ++it) {
       TypeHandle type = *it;
-      TypeHandle lub = Type::BitsetType::New(type->BitsetLub(),  
T.region());
+      TypeHandle lub =
+          Rep::BitsetType::New(Rep::BitsetType::Lub(type), T.region());
       TypeHandle inherent =
-          Type::BitsetType::New(type->InherentBitsetLub(), T.region());
+          Rep::BitsetType::New(Rep::BitsetType::InherentLub(type),  
T.region());
       CHECK(lub->Is(inherent));
     }
   }

--
--
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev
--- 
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to v8-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.