diff options
| author | Sebastien Hertz <shertz@google.com> | 2015-06-09 14:09:14 +0200 |
|---|---|---|
| committer | Mingyao Yang <mingyao@google.com> | 2015-06-18 14:14:29 -0700 |
| commit | bf1fa2ccb5e7409910b99dc46b616e44c66ade68 (patch) | |
| tree | 652b3ae6787c63955b745693da6919407cf5ebf5 /tools | |
| parent | ef484d442a3dcae2cd1842c5be0623f5cf71e4ab (diff) | |
| download | art-bf1fa2ccb5e7409910b99dc46b616e44c66ade68.zip art-bf1fa2ccb5e7409910b99dc46b616e44c66ade68.tar.gz art-bf1fa2ccb5e7409910b99dc46b616e44c66ade68.tar.bz2 | |
Follow up on CL 151605
- Fixes return type of StackedShadowFrameRecord::GetType
- Makes StackedShadowFrameType an enum class (scoped enum)
- Moves DeoptimizationReturnValueRecord and StackedShadowFrameRecord
to thread.cc file and use forward declaration in thread.h header
- Fixes tools/generate-operator-out.py for scoped enum classes.
Bug: 20845490
(cherry picked from commit f795869da0a1fa006fdcdacd8afb6149a63fc1a7)
Change-Id: I6b67e288b1db563699161e58ec2e2330d42dd8f5
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/generate-operator-out.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/generate-operator-out.py b/tools/generate-operator-out.py index 2b57222..c74508d 100755 --- a/tools/generate-operator-out.py +++ b/tools/generate-operator-out.py @@ -154,10 +154,12 @@ def ProcessFile(filename): sys.stderr.write('%s\n' % (rest)) Confused(filename, line_number, raw_line) - if len(enclosing_classes) > 0: - if is_enum_class: - enum_value = enum_name + '::' + enum_value - else: + # If the enum is scoped, we must prefix enum value with enum name (which is already prefixed + # by enclosing classes). + if is_enum_class: + enum_value = enum_name + '::' + enum_value + else: + if len(enclosing_classes) > 0: enum_value = '::'.join(enclosing_classes) + '::' + enum_value _ENUMS[enum_name].append((enum_value, enum_text)) |