Separating transitions from descriptors.

src/property.cc

Index: src/property.cc
diff --git a/src/property.cc b/src/property.cc
index 3258b8cb3a7ca4363561aca43671d58acd29c63f..e0dac19c61bdc7ec3e864fc99ef71b3920dcb551 100644
--- a/src/property.cc
+++ b/src/property.cc
@@ -55,12 +55,6 @@ void LookupResult::Print(FILE* out) {
       PrintF(out, " -type = normal\n");
       PrintF(out, " -entry = %d", GetDictionaryEntry());
       break;
-    case MAP_TRANSITION:
-      PrintF(out, " -type = map transition\n");
-      PrintF(out, " -map:\n");
-      GetTransitionMap()->Print(out);
-      PrintF(out, "\n");
-      break;
     case CONSTANT_FUNCTION:
       PrintF(out, " -type = constant function\n");
       PrintF(out, " -function:\n");
@@ -83,12 +77,29 @@ void LookupResult::Print(FILE* out) {
     case INTERCEPTOR:
       PrintF(out, " -type = lookup interceptor\n");
       break;
-    case CONSTANT_TRANSITION:
-      PrintF(out, " -type = constant property transition\n");
-      PrintF(out, " -map:\n");
-      GetTransitionMap()->Print(out);
-      PrintF(out, "\n");
-      break;
+    case TRANSITION:
+      switch (GetTransitionDetails().type()) {
+        case FIELD:
+          PrintF(out, " -type = map transition\n");
+          PrintF(out, " -map:\n");
+          GetTransitionMap()->Print(out);
+          PrintF(out, "\n");
+          return;
+        case CONSTANT_FUNCTION:
+          PrintF(out, " -type = constant property transition\n");
+          PrintF(out, " -map:\n");
+          GetTransitionMap()->Print(out);
+          PrintF(out, "\n");
+          return;
+        case CALLBACKS:
+          PrintF(out, " -type = call backs transition\n");

[Jakob Kummerow, 2012/06/29 16:31:36]

nit: callbacks is one word

[Toon Verwaest, 2012/07/05 12:56:11]

Done.

+          PrintF(out, " -callback object:\n");
+          GetCallbackObject()->Print(out);
+          return;
+        default:
+          UNREACHABLE();
+          return;
+      }
     case NONEXISTENT:
       UNREACHABLE();
       break;
@@ -108,29 +119,4 @@ void Descriptor::Print(FILE* out) {
 #endif
 
 
-bool Descriptor::ContainsTransition() {
-  switch (details_.type()) {
-    case MAP_TRANSITION:
-    case CONSTANT_TRANSITION:
-      return true;
-    case CALLBACKS: {
-      if (!value_->IsAccessorPair()) return false;
-      AccessorPair* accessors = AccessorPair::cast(value_);
-      return accessors->getter()->IsMap() || accessors->setter()->IsMap();
-    }
-    case NORMAL:
-    case FIELD:
-    case CONSTANT_FUNCTION:
-    case HANDLER:
-    case INTERCEPTOR:
-      return false;
-    case NONEXISTENT:
-      UNREACHABLE();
-      break;
-  }
-  UNREACHABLE();  // Keep the compiler happy.
-  return false;
-}
-
-
 } }  // namespace v8::internal