1 files changed, 57 insertions, 7 deletions

diff --git a/Source/JavaScriptCore/dfg/DFGArgumentPosition.h b/Source/JavaScriptCore/dfg/DFGArgumentPosition.h
index 05d1cb048..822b45474 100644
--- a/Source/JavaScriptCore/dfg/DFGArgumentPosition.h
+++ b/Source/JavaScriptCore/dfg/DFGArgumentPosition.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012, 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,6 +28,7 @@
 
 #include "DFGDoubleFormatState.h"
 #include "DFGVariableAccessData.h"
+#include "DFGVariableAccessDataDump.h"
 #include "SpeculatedType.h"
 
 namespace JSC { namespace DFG {
@@ -37,6 +38,8 @@ public:
     ArgumentPosition()
         : m_prediction(SpecNone)
         , m_doubleFormatState(EmptyDoubleFormatState)
+        , m_isProfitableToUnbox(false)
+        , m_shouldNeverUnbox(false)
     {
     }
     
@@ -45,33 +48,80 @@ public:
         m_variables.append(variable);
     }
     
-    bool mergeArgumentAwareness()
+    bool mergeShouldNeverUnbox(bool shouldNeverUnbox)
+    {
+        return checkAndSet(m_shouldNeverUnbox, m_shouldNeverUnbox | shouldNeverUnbox);
+    }
+    
+    bool mergeArgumentPredictionAwareness()
     {
         bool changed = false;
         for (unsigned i = 0; i < m_variables.size(); ++i) {
-            changed |= mergeSpeculation(m_prediction, m_variables[i]->argumentAwarePrediction());
-            changed |= mergeDoubleFormatState(m_doubleFormatState, m_variables[i]->doubleFormatState());
+            VariableAccessData* variable = m_variables[i]->find();
+            changed |= mergeSpeculation(m_prediction, variable->argumentAwarePrediction());
+            changed |= mergeDoubleFormatState(m_doubleFormatState, variable->doubleFormatState());
+            changed |= mergeShouldNeverUnbox(variable->shouldNeverUnbox());
         }
         if (!changed)
             return false;
         changed = false;
         for (unsigned i = 0; i < m_variables.size(); ++i) {
-            changed |= m_variables[i]->mergeArgumentAwarePrediction(m_prediction);
-            changed |= m_variables[i]->mergeDoubleFormatState(m_doubleFormatState);
+            VariableAccessData* variable = m_variables[i]->find();
+            changed |= variable->mergeArgumentAwarePrediction(m_prediction);
+            changed |= variable->mergeDoubleFormatState(m_doubleFormatState);
+            changed |= variable->mergeShouldNeverUnbox(m_shouldNeverUnbox);
         }
         return changed;
     }
     
+    bool mergeArgumentUnboxingAwareness()
+    {
+        bool changed = false;
+        for (unsigned i = 0; i < m_variables.size(); ++i) {
+            VariableAccessData* variable = m_variables[i]->find();
+            changed |= checkAndSet(m_isProfitableToUnbox, m_isProfitableToUnbox | variable->isProfitableToUnbox());
+        }
+        if (!changed)
+            return false;
+        changed = false;
+        for (unsigned i = 0; i < m_variables.size(); ++i) {
+            VariableAccessData* variable = m_variables[i]->find();
+            changed |= variable->mergeIsProfitableToUnbox(m_isProfitableToUnbox);
+        }
+        return changed;
+    }
+    
+    bool shouldUnboxIfPossible() const { return m_isProfitableToUnbox && !m_shouldNeverUnbox; }
+    
     SpeculatedType prediction() const { return m_prediction; }
     DoubleFormatState doubleFormatState() const { return m_doubleFormatState; }
     bool shouldUseDoubleFormat() const
     {
-        return doubleFormatState() == UsingDoubleFormat;
+        return doubleFormatState() == UsingDoubleFormat && shouldUnboxIfPossible();
+    }
+    
+    void dump(PrintStream& out, Graph* graph)
+    {
+        for (unsigned i = 0; i < m_variables.size(); ++i) {
+            VariableAccessData* variable = m_variables[i]->find();
+            int operand = variable->operand();
+
+            if (i)
+                out.print(" ");
+
+            if (operandIsArgument(operand))
+                out.print("arg", operandToArgument(operand), "(", VariableAccessDataDump(*graph, variable), ")");
+            else
+                out.print("r", operand, "(", VariableAccessDataDump(*graph, variable), ")");
+        }
+        out.print("\n");
     }
     
 private:
     SpeculatedType m_prediction;
     DoubleFormatState m_doubleFormatState;
+    bool m_isProfitableToUnbox;
+    bool m_shouldNeverUnbox;
     
     Vector<VariableAccessData*, 2> m_variables;
 };