webkitgtk-2.4.11webkitgtk-2.4.11

1 files changed, 6 insertions, 69 deletions

diff --git a/Source/JavaScriptCore/ftl/FTLExitValue.cpp b/Source/JavaScriptCore/ftl/FTLExitValue.cpp
index 7004b9bdb..a987c60ce 100644
--- a/Source/JavaScriptCore/ftl/FTLExitValue.cpp
+++ b/Source/JavaScriptCore/ftl/FTLExitValue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -28,61 +28,10 @@
 
 #if ENABLE(FTL_JIT)
 
-#include "FTLExitTimeObjectMaterialization.h"
-#include "JSCInlines.h"
-#include "TrackedReferences.h"
+#include "Operations.h"
 
 namespace JSC { namespace FTL {
 
-ExitValue ExitValue::materializeNewObject(ExitTimeObjectMaterialization* data)
-{
-    ExitValue result;
-    result.m_kind = ExitValueMaterializeNewObject;
-    result.u.newObjectMaterializationData = data;
-    return result;
-}
-
-ExitValue ExitValue::withLocalsOffset(int offset) const
-{
-    if (!isInJSStackSomehow())
-        return *this;
-    if (!virtualRegister().isLocal())
-        return *this;
-    return withVirtualRegister(virtualRegister() + offset);
-}
-
-DataFormat ExitValue::dataFormat() const
-{
-    switch (kind()) {
-    case InvalidExitValue:
-        RELEASE_ASSERT_NOT_REACHED();
-        return DataFormatNone;
-            
-    case ExitValueDead:
-    case ExitValueConstant:
-    case ExitValueInJSStack:
-    case ExitValueMaterializeNewObject:
-        return DataFormatJS;
-            
-    case ExitValueArgument:
-        return exitArgument().format();
-            
-    case ExitValueInJSStackAsInt32:
-        return DataFormatInt32;
-            
-    case ExitValueInJSStackAsInt52:
-        return DataFormatInt52;
-            
-    case ExitValueInJSStackAsDouble:
-        return DataFormatDouble;
-            
-    case ExitValueRecovery:
-        return recoveryFormat();
-    }
-        
-    RELEASE_ASSERT_NOT_REACHED();
-}
-
 void ExitValue::dumpInContext(PrintStream& out, DumpContext* context) const
 {
     switch (kind()) {
@@ -99,22 +48,16 @@ void ExitValue::dumpInContext(PrintStream& out, DumpContext* context) const
         out.print("Constant(", inContext(constant(), context), ")");
         return;
     case ExitValueInJSStack:
-        out.print("InJSStack:", virtualRegister());
+        out.print("InJSStack:r", virtualRegister());
         return;
     case ExitValueInJSStackAsInt32:
-        out.print("InJSStackAsInt32:", virtualRegister());
+        out.print("InJSStackAsInt32:r", virtualRegister());
         return;
     case ExitValueInJSStackAsInt52:
-        out.print("InJSStackAsInt52:", virtualRegister());
+        out.print("InJSStackAsInt52:r", virtualRegister());
         return;
     case ExitValueInJSStackAsDouble:
-        out.print("InJSStackAsDouble:", virtualRegister());
-        return;
-    case ExitValueRecovery:
-        out.print("Recovery(", recoveryOpcode(), ", arg", leftRecoveryArgument(), ", arg", rightRecoveryArgument(), ", ", recoveryFormat(), ")");
-        return;
-    case ExitValueMaterializeNewObject:
-        out.print("Materialize(", WTF::RawPointer(objectMaterialization()), ")");
+        out.print("InJSStackAsDouble:r", virtualRegister());
         return;
     }
     
@@ -126,12 +69,6 @@ void ExitValue::dump(PrintStream& out) const
     dumpInContext(out, 0);
 }
 
-void ExitValue::validateReferences(const TrackedReferences& trackedReferences) const
-{
-    if (isConstant())
-        trackedReferences.check(constant());
-}
-
 } } // namespace JSC::FTL
 
 #endif // ENABLE(FTL_JIT)