X-Git-Url: https://git.saurik.com/apple/javascriptcore.git/blobdiff_plain/2d39b0e377c0896910ee49ae70082ba665faf986..refs/heads/master:/dfg/DFGVariableAccessData.cpp diff --git a/dfg/DFGVariableAccessData.cpp b/dfg/DFGVariableAccessData.cpp index 82784c8..bd1ba87 100644 --- a/dfg/DFGVariableAccessData.cpp +++ b/dfg/DFGVariableAccessData.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Apple Inc. All rights reserved. + * Copyright (C) 2014, 2015 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -35,9 +35,7 @@ VariableAccessData::VariableAccessData() , m_prediction(SpecNone) , m_argumentAwarePrediction(SpecNone) , m_flags(0) - , m_isCaptured(false) , m_shouldNeverUnbox(false) - , m_isArgumentsAlias(false) , m_structureCheckHoistingFailed(false) , m_checkArrayHoistingFailed(false) , m_isProfitableToUnbox(false) @@ -47,14 +45,12 @@ VariableAccessData::VariableAccessData() clearVotes(); } -VariableAccessData::VariableAccessData(VirtualRegister local, bool isCaptured) +VariableAccessData::VariableAccessData(VirtualRegister local) : m_local(local) , m_prediction(SpecNone) , m_argumentAwarePrediction(SpecNone) , m_flags(0) - , m_isCaptured(isCaptured) - , m_shouldNeverUnbox(isCaptured) - , m_isArgumentsAlias(false) + , m_shouldNeverUnbox(false) , m_structureCheckHoistingFailed(false) , m_checkArrayHoistingFailed(false) , m_isProfitableToUnbox(false) @@ -64,12 +60,6 @@ VariableAccessData::VariableAccessData(VirtualRegister local, bool isCaptured) clearVotes(); } -bool VariableAccessData::mergeIsCaptured(bool isCaptured) -{ - return checkAndSet(m_shouldNeverUnbox, m_shouldNeverUnbox | isCaptured) - | checkAndSet(m_isCaptured, m_isCaptured | isCaptured); -} - bool VariableAccessData::mergeShouldNeverUnbox(bool shouldNeverUnbox) { bool newShouldNeverUnbox = m_shouldNeverUnbox | shouldNeverUnbox; @@ -198,9 +188,6 @@ FlushFormat VariableAccessData::flushFormat() { ASSERT(find() == this); - if (isArgumentsAlias()) - return FlushedArguments; - if (!shouldUnboxIfPossible()) return FlushedJSValue;