Bug 1165486 followup: Annotate toObjectBox() impls as 'override'. rs=ehsan
☠☠ backed out by efd38e59dbc8 ☠ ☠
authorDaniel Holbert <dholbert@cs.stanford.edu>
Mon, 15 Jun 2015 23:21:51 -0700
changeset 279822 fd6c99f92485b60209f8043e9f91ffb7707806af
parent 279821 9a3fa532721bc3af5afe95bf7468a30640e1bbb5
child 279823 68c24c8bf174712eeb201186e22b2bad2ae10ce1
push id4932
push userjlund@mozilla.com
push dateMon, 10 Aug 2015 18:23:06 +0000
treeherdermozilla-beta@6dd5a4f5f745 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs1165486
milestone41.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1165486 followup: Annotate toObjectBox() impls as 'override'. rs=ehsan
js/src/frontend/SharedContext.h
--- a/js/src/frontend/SharedContext.h
+++ b/js/src/frontend/SharedContext.h
@@ -288,17 +288,17 @@ class GlobalSharedContext : public Share
                         bool extraWarnings)
       : SharedContext(cx, directives, extraWarnings),
         topStaticScope_(topStaticScope),
         allowNewTarget_(computeAllowSyntax(AllowedSyntax::NewTarget)),
         allowSuperProperty_(computeAllowSyntax(AllowedSyntax::SuperProperty)),
         inWith_(computeInWith())
     {}
 
-    ObjectBox* toObjectBox() { return nullptr; }
+    ObjectBox* toObjectBox() override { return nullptr; }
     HandleObject topStaticScope() const { return topStaticScope_; }
     bool allowSyntax(AllowedSyntax allowSyntax) const override {
         switch (allowSyntax) {
           case AllowedSyntax::NewTarget:
             // Any function supports new.target
             return allowNewTarget_;
           case AllowedSyntax::SuperProperty:
             return allowSuperProperty_;
@@ -333,17 +333,17 @@ class FunctionBox : public ObjectBox, pu
 
     FunctionContextFlags funCxFlags;
 
     template <typename ParseHandler>
     FunctionBox(ExclusiveContext* cx, ObjectBox* traceListHead, JSFunction* fun,
                 ParseContext<ParseHandler>* pc, Directives directives,
                 bool extraWarnings, GeneratorKind generatorKind);
 
-    ObjectBox* toObjectBox() { return this; }
+    ObjectBox* toObjectBox() override { return this; }
     JSFunction* function() const { return &object->as<JSFunction>(); }
 
     GeneratorKind generatorKind() const { return GeneratorKindFromBits(generatorKindBits_); }
     bool isGenerator() const { return generatorKind() != NotGenerator; }
     bool isLegacyGenerator() const { return generatorKind() == LegacyGenerator; }
     bool isStarGenerator() const { return generatorKind() == StarGenerator; }
 
     void setGeneratorKind(GeneratorKind kind) {