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
This commit is contained in:
parent
1c63e53675
commit
92d163e156
@ -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,7 +309,7 @@ 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
|
||||||
|
@ -145,7 +145,7 @@ 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);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user