diff options
Diffstat (limited to 'Source/JavaScriptCore/dfg/DFGMinifiedNode.cpp')
-rw-r--r-- | Source/JavaScriptCore/dfg/DFGMinifiedNode.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Source/JavaScriptCore/dfg/DFGMinifiedNode.cpp b/Source/JavaScriptCore/dfg/DFGMinifiedNode.cpp index 6362344fb..5fec77198 100644 --- a/Source/JavaScriptCore/dfg/DFGMinifiedNode.cpp +++ b/Source/JavaScriptCore/dfg/DFGMinifiedNode.cpp @@ -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 @@ -32,20 +32,20 @@ namespace JSC { namespace DFG { -MinifiedNode MinifiedNode::fromNode(NodeIndex nodeIndex, Node& node) +MinifiedNode MinifiedNode::fromNode(Node* node) { - ASSERT(belongsInMinifiedGraph(node.op())); + ASSERT(belongsInMinifiedGraph(node->op())); MinifiedNode result; - result.m_index = nodeIndex; - result.m_op = node.op(); - if (hasChild(node.op())) - result.m_childOrInfo = node.child1().index(); - else if (hasConstantNumber(node.op())) - result.m_childOrInfo = node.constantNumber(); - else if (hasWeakConstant(node.op())) - result.m_childOrInfo = bitwise_cast<uintptr_t>(node.weakConstant()); + result.m_id = MinifiedID(node); + result.m_op = node->op(); + if (hasChild(node->op())) + result.m_childOrInfo = MinifiedID(node->child1().node()).m_id; + else if (hasConstantNumber(node->op())) + result.m_childOrInfo = node->constantNumber(); + else if (hasWeakConstant(node->op())) + result.m_childOrInfo = bitwise_cast<uintptr_t>(node->weakConstant()); else { - ASSERT(node.op() == PhantomArguments); + ASSERT(node->op() == PhantomArguments); result.m_childOrInfo = 0; } return result; |