| Index: src/objects.h
 | 
| diff --git a/src/objects.h b/src/objects.h
 | 
| index 8f9a7b56641409ef45176e7d3a611aaa0e30aeae..fb9d55ea77006d1f7a671c18ec4f7340406c4d9d 100644
 | 
| --- a/src/objects.h
 | 
| +++ b/src/objects.h
 | 
| @@ -7020,8 +7020,10 @@ class Script: public Struct {
 | 
|    V(RegExp.prototype, exec, RegExpExec)                     \
 | 
|    V(RegExp.prototype, test, RegExpTest)                     \
 | 
|    V(RegExp.prototype, toString, RegExpToString)             \
 | 
| -  V(String.prototype, charCodeAt, StringCharCodeAt)         \
 | 
| +  V(String, fromCharCode, StringFromCharCode)               \
 | 
| +  V(String, fromCodePoint, StringFromCodePoint)             \
 | 
|    V(String.prototype, charAt, StringCharAt)                 \
 | 
| +  V(String.prototype, charCodeAt, StringCharCodeAt)         \
 | 
|    V(String.prototype, codePointAt, StringCodePointAt)       \
 | 
|    V(String.prototype, concat, StringConcat)                 \
 | 
|    V(String.prototype, endsWith, StringEndsWith)             \
 | 
| @@ -7031,17 +7033,15 @@ class Script: public Struct {
 | 
|    V(String.prototype, repeat, StringRepeat)                 \
 | 
|    V(String.prototype, slice, StringSlice)                   \
 | 
|    V(String.prototype, startsWith, StringStartsWith)         \
 | 
| -  V(String.prototype, substr, StringSubstr)                 \
 | 
|    V(String.prototype, substring, StringSubstring)           \
 | 
| +  V(String.prototype, substr, StringSubstr)                 \
 | 
|    V(String.prototype, toLowerCase, StringToLowerCase)       \
 | 
|    V(String.prototype, toString, StringToString)             \
 | 
|    V(String.prototype, toUpperCase, StringToUpperCase)       \
 | 
| -  V(String.prototype, trim, StringTrim)                     \
 | 
|    V(String.prototype, trimLeft, StringTrimLeft)             \
 | 
|    V(String.prototype, trimRight, StringTrimRight)           \
 | 
| +  V(String.prototype, trim, StringTrim)                     \
 | 
|    V(String.prototype, valueOf, StringValueOf)               \
 | 
| -  V(String, fromCharCode, StringFromCharCode)               \
 | 
| -  V(String, fromCodePoint, StringFromCodePoint)             \
 | 
|    V(String, raw, StringRaw)                                 \
 | 
|    V(Math, random, MathRandom)                               \
 | 
|    V(Math, floor, MathFloor)                                 \
 | 
| 
 |