Commit 5db17032 authored by Bill Budge's avatar Bill Budge Committed by Commit Bot

[ia32] Fix problem with ambiguous constructor (on OSX)

Change-Id: I6bc23527f63e86ecde228c85d499c55278ff555e
Reviewed-on: https://chromium-review.googlesource.com/1041949
Commit-Queue: Bill Budge <bbudge@chromium.org>
Reviewed-by: 's avatarClemens Hammacher <clemensh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#52954}
parent 2c0edb48
......@@ -233,6 +233,7 @@ enum RoundingMode {
class Immediate BASE_EMBEDDED {
public:
// Calls where x is an Address (uintptr_t) resolve to this overload.
inline explicit Immediate(int x, RelocInfo::Mode rmode = RelocInfo::NONE) {
value_.immediate = x;
rmode_ = rmode;
......@@ -243,9 +244,6 @@ class Immediate BASE_EMBEDDED {
: Immediate(handle.address(), RelocInfo::EMBEDDED_OBJECT) {}
inline explicit Immediate(Smi* value)
: Immediate(reinterpret_cast<intptr_t>(value)) {}
inline explicit Immediate(Address addr,
RelocInfo::Mode rmode = RelocInfo::NONE)
: Immediate(static_cast<int32_t>(addr), rmode) {}
static Immediate EmbeddedNumber(double number); // Smi or HeapNumber.
static Immediate EmbeddedCode(CodeStub* code);
......
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