Bug 156941 – Renaming SpecInt32, SpecInt52, MachineInt to SpecInt32Only, SpecInt52Only, AnyInt.

• Status: RESOLVED
• Resolution: FIXED
• Component: JavaScriptCore

[Mark Lam]

While looking at https://bugs.webkit.org/show_bug.cgi?id=153431, it was decided that SpecInt32Only, SpecInt52Only, and AnyInt would be better names for SpecInt32, SpecInt52, and MachineInt.  Let's do a bulk rename.

[Mark Lam]

Created attachment 277120 [details]
proposed patch.

[WebKit Commit Bot]

Attachment 277120 [details] did not pass style-queue:


ERROR: Source/JavaScriptCore/bytecode/SpeculatedType.cpp:185:  Multi line control clauses should use braces.  [whitespace/braces] [4]
Total errors found: 1 in 37 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Filip Pizlo]

Comment on attachment 277120 [details]
proposed patch.

View in context: https://bugs.webkit.org/attachment.cgi?id=277120&action=review

> Source/JavaScriptCore/bytecode/SpeculatedType.h:71
> +static const SpeculatedType SpecAnyInt             = SpecInt32Only | SpecInt52Only; // It's something that we can do machine int arithmetic on.

It's a shame that this is called AnyInt while we have:

> Source/JavaScriptCore/bytecode/SpeculatedType.h:72
>  static const SpeculatedType SpecInt52AsDouble      = 1u << 24; // It's definitely an Int52 and it's inside a double.

Under the new nomenclature, this should be called SpecAnyIntAsDouble.

> Source/JavaScriptCore/bytecode/SpeculatedType.h:73
> +static const SpeculatedType SpecInteger            = SpecAnyInt | SpecInt52AsDouble; // It's definitely some kind of integer.

And this.

I think this is why the other one was called MachineInt.  Looking at the code, it seems that SpecInteger is used only in one place.  We could just remove SpecInteger and replace its one use with "SpecAnyInt | SpecAnyIntAsDouble"

[Mark Lam]

Created attachment 277258 [details]
proposed patch w/ Fil's feedback applied.

[Mark Lam]

Created attachment 277259 [details]
Diff of patches (last vs current) for your convenience.

[WebKit Commit Bot]

Attachment 277258 [details] did not pass style-queue:


ERROR: Source/JavaScriptCore/bytecode/SpeculatedType.cpp:185:  Multi line control clauses should use braces.  [whitespace/braces] [4]
Total errors found: 1 in 37 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Mark Lam]

Thanks for the review.  Landed in r200034: <http://trac.webkit.org/r200034>.