Commit 92d163e1 authored by erik.corry@gmail.com's avatar erik.corry@gmail.com

Fix a couple of cast errors for gcc-3.4.3. Patch by Ryan Dahl....

Fix a couple of cast errors for gcc-3.4.3.  Patch by Ryan Dahl. http://codereview.chromium.org/5976006/

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@6103 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 1c63e536
...@@ -1391,7 +1391,7 @@ class BinaryOperation: public Expression { ...@@ -1391,7 +1391,7 @@ class BinaryOperation: public Expression {
: op_(op), left_(left), right_(right), pos_(pos), is_smi_only_(false) { : op_(op), left_(left), right_(right), pos_(pos), is_smi_only_(false) {
ASSERT(Token::IsBinaryOp(op)); ASSERT(Token::IsBinaryOp(op));
right_id_ = (op == Token::AND || op == Token::OR) right_id_ = (op == Token::AND || op == Token::OR)
? GetNextId() ? static_cast<int>(GetNextId())
: AstNode::kNoNumber; : AstNode::kNoNumber;
} }
......
...@@ -309,9 +309,9 @@ void Deoptimizer::TearDown() { ...@@ -309,9 +309,9 @@ void Deoptimizer::TearDown() {
} }
unsigned Deoptimizer::GetOutputInfo(DeoptimizationOutputData* data, int Deoptimizer::GetOutputInfo(DeoptimizationOutputData* data,
unsigned id, unsigned id,
SharedFunctionInfo* shared) { SharedFunctionInfo* shared) {
// TODO(kasperl): For now, we do a simple linear search for the PC // TODO(kasperl): For now, we do a simple linear search for the PC
// offset associated with the given node id. This should probably be // offset associated with the given node id. This should probably be
// changed to a binary search. // changed to a binary search.
......
...@@ -145,9 +145,9 @@ class Deoptimizer : public Malloced { ...@@ -145,9 +145,9 @@ class Deoptimizer : public Malloced {
static Address GetDeoptimizationEntry(int id, BailoutType type); static Address GetDeoptimizationEntry(int id, BailoutType type);
static int GetDeoptimizationId(Address addr, BailoutType type); static int GetDeoptimizationId(Address addr, BailoutType type);
static unsigned GetOutputInfo(DeoptimizationOutputData* data, static int GetOutputInfo(DeoptimizationOutputData* data,
unsigned node_id, unsigned node_id,
SharedFunctionInfo* shared); SharedFunctionInfo* shared);
static void Setup(); static void Setup();
static void TearDown(); static void TearDown();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment