Index: runtime/vm/locations.h |
diff --git a/runtime/vm/locations.h b/runtime/vm/locations.h |
index 1393d312132253d2ee84c3782e35220854a7bc5d..a9d03207e398391d30e85133ec4f8b0ac1d3985f 100644 |
--- a/runtime/vm/locations.h |
+++ b/runtime/vm/locations.h |
@@ -49,10 +49,15 @@ class Location : public ValueObject { |
kStackSlot = 4, |
}; |
+ enum ContainsCall { |
Kevin Millikin (Google)
2012/07/31 11:06:09
I moved this here because the name is shorter at t
Vyacheslav Egorov (Google)
2012/07/31 11:21:26
But it is not a property of location, it's a prope
|
+ kNoCall, |
+ kCall, |
+ }; |
+ |
enum { |
// Number of bits required to encode Kind value. |
kBitsForKind = 3, |
- kBitsForPayload = kWordSize * kBitsPerByte - kBitsForKind |
+ kBitsForPayload = kWordSize * kBitsPerByte - kBitsForKind, |
}; |
static const uword kInvalidLocation = 0; |
@@ -209,15 +214,9 @@ class Location : public ValueObject { |
// Specification of locations for inputs and output. |
class LocationSummary : public ZoneAllocated { |
public: |
- enum ContainsCall { |
- kNoCall, |
- kCall, |
- }; |
- |
- // TODO(vegorov): remove unsafe kNoCall default. |
LocationSummary(intptr_t input_count, |
intptr_t temp_count, |
- ContainsCall call = kNoCall); |
+ Location::ContainsCall contains_call); |
intptr_t input_count() const { |
return input_locations_.length(); |
@@ -275,7 +274,7 @@ class LocationSummary : public ZoneAllocated { |
static LocationSummary* Make(intptr_t input_count, |
Location out, |
- ContainsCall contains_call = kNoCall); |
+ Location::ContainsCall contains_call); |
private: |
// TODO(vegorov): replace with ZoneArray. |