wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1119259 - Mark virtual overridden functions as MOZ_OVERRIDE in JS; r=Waldo

Browse Source
This commit is contained in:
Ehsan Akhgari 2015-01-08 10:14:24 -05:00
parent fa9d4d89e2
commit a79f364c2f
9 changed files with 736 additions and 728 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/src/jit/IonCaches.h
View File

@ -386,17 +386,17 @@ class RepatchIonCache : public IonCache
{
}
virtual void reset();
virtual void reset() MOZ_OVERRIDE;
// Set the initial jump state of the cache. The initialJump is the inline
// jump that will point to out-of-line code (such as the slow path, or
// stubs), and the rejoinLabel is the position that all out-of-line paths
// will rejoin to.
void emitInitialJump(MacroAssembler &masm, AddCacheState &addState);
void bindInitialJump(MacroAssembler &masm, AddCacheState &addState);
void emitInitialJump(MacroAssembler &masm, AddCacheState &addState) MOZ_OVERRIDE;
void bindInitialJump(MacroAssembler &masm, AddCacheState &addState) MOZ_OVERRIDE;
// Update the labels once the code is finalized.
void updateBaseAddress(JitCode *code, MacroAssembler &masm);
void updateBaseAddress(JitCode *code, MacroAssembler &masm) MOZ_OVERRIDE;
virtual void *rejoinAddress() MOZ_OVERRIDE {
return rejoinLabel().raw();
@ -492,14 +492,14 @@ class DispatchIonCache : public IonCache
{
}
virtual void reset();
virtual void initializeAddCacheState(LInstruction *ins, AddCacheState *addState);
virtual void reset() MOZ_OVERRIDE;
virtual void initializeAddCacheState(LInstruction *ins, AddCacheState *addState) MOZ_OVERRIDE;
void emitInitialJump(MacroAssembler &masm, AddCacheState &addState);
void bindInitialJump(MacroAssembler &masm, AddCacheState &addState);
void emitInitialJump(MacroAssembler &masm, AddCacheState &addState) MOZ_OVERRIDE;
void bindInitialJump(MacroAssembler &masm, AddCacheState &addState) MOZ_OVERRIDE;
// Fix up the first stub pointer once the code is finalized.
void updateBaseAddress(JitCode *code, MacroAssembler &masm);
void updateBaseAddress(JitCode *code, MacroAssembler &masm) MOZ_OVERRIDE;
virtual void *rejoinAddress() MOZ_OVERRIDE {
return rejoinLabel_.raw();

6
js/src/jit/LIR.h
View File

@ -1029,14 +1029,14 @@ class LInstructionHelper : public LInstruction
temps_[index] = a;
}
size_t numSuccessors() const {
size_t numSuccessors() const MOZ_OVERRIDE {
return 0;
}
MBasicBlock *getSuccessor(size_t i) const {
MBasicBlock *getSuccessor(size_t i) const MOZ_OVERRIDE {
MOZ_ASSERT(false);
return nullptr;
}
void setSuccessor(size_t i, MBasicBlock *successor) {
void setSuccessor(size_t i, MBasicBlock *successor) MOZ_OVERRIDE {
MOZ_ASSERT(false);
}

1418
js/src/jit/MIR.h
View File

File diff suppressed because it is too large Load Diff

2
js/src/jsapi-tests/testChromeBuffer.cpp
View File

@ -198,7 +198,7 @@ BEGIN_TEST(testChromeBuffer)
return true;
}
virtual void uninit() {
virtual void uninit() MOZ_OVERRIDE {
trusted_glob = nullptr;
trusted_fun = nullptr;
JS::RemoveObjectRoot(cx, &trusted_glob);

4
js/src/jsapi-tests/testGCOutOfMemory.cpp
View File

@ -52,7 +52,7 @@ BEGIN_TEST(testGCOutOfMemory)
return true;
}
virtual JSRuntime * createRuntime() {
virtual JSRuntime * createRuntime() MOZ_OVERRIDE {
JSRuntime *rt = JS_NewRuntime(768 * 1024);
if (!rt)
return nullptr;
@ -60,7 +60,7 @@ virtual JSRuntime * createRuntime() {
return rt;
}
virtual void destroyRuntime() {
virtual void destroyRuntime() MOZ_OVERRIDE {
JS_DestroyRuntime(rt);
}

2
js/src/jsapi-tests/testOOM.cpp
View File

@ -17,7 +17,7 @@ BEGIN_TEST(testOOM)
return true;
}
virtual JSRuntime * createRuntime()
virtual JSRuntime * createRuntime() MOZ_OVERRIDE
{
JSRuntime *rt = JS_NewRuntime(0);
if (!rt)

8
js/src/jsapi-tests/tests.h
View File

@ -317,8 +317,8 @@ class JSAPITest
#define BEGIN_TEST(testname) \
class cls_##testname : public JSAPITest { \
public: \
virtual const char * name() { return #testname; } \
virtual bool run(JS::HandleObject global)
virtual const char * name() MOZ_OVERRIDE { return #testname; } \
virtual bool run(JS::HandleObject global) MOZ_OVERRIDE
#define END_TEST(testname) \
}; \
@ -335,8 +335,8 @@ class JSAPITest
#define BEGIN_FIXTURE_TEST(fixture, testname) \
class cls_##testname : public fixture { \
public: \
virtual const char * name() { return #testname; } \
virtual bool run(JS::HandleObject global)
virtual const char * name() MOZ_OVERRIDE { return #testname; } \
virtual bool run(JS::HandleObject global) MOZ_OVERRIDE
#define END_FIXTURE_TEST(fixture, testname) \
}; \

2
js/src/jsproxy.h
View File

@ -409,7 +409,7 @@ class JS_PUBLIC_API(DirectProxyHandler) : public BaseProxyHandler
unsigned indent) const MOZ_OVERRIDE;
virtual bool regexp_toShared(JSContext *cx, HandleObject proxy,
RegExpGuard *g) const MOZ_OVERRIDE;
virtual bool boxedValue_unbox(JSContext *cx, HandleObject proxy, MutableHandleValue vp) const;
virtual bool boxedValue_unbox(JSContext *cx, HandleObject proxy, MutableHandleValue vp) const MOZ_OVERRIDE;
virtual bool isCallable(JSObject *obj) const MOZ_OVERRIDE;
virtual JSObject *weakmapKeyDelegate(JSObject *proxy) const MOZ_OVERRIDE;
};

4
js/src/vm/ScopeObject.cpp
View File

@ -1574,7 +1574,7 @@ class DebugScopeProxy : public BaseProxyHandler
}
bool getOwnPropertyDescriptor(JSContext *cx, HandleObject proxy, HandleId id,
MutableHandle<PropertyDescriptor> desc) const
MutableHandle<PropertyDescriptor> desc) const MOZ_OVERRIDE
{
Rooted<DebugScopeObject*> debugScope(cx, &proxy->as<DebugScopeObject>());
Rooted<ScopeObject*> scope(cx, &debugScope->scope());
@ -1732,7 +1732,7 @@ class DebugScopeProxy : public BaseProxyHandler
JS_PROPERTYOP_SETTER(desc.setter()));
}
bool ownPropertyKeys(JSContext *cx, HandleObject proxy, AutoIdVector &props) const
bool ownPropertyKeys(JSContext *cx, HandleObject proxy, AutoIdVector &props) const MOZ_OVERRIDE
{
Rooted<ScopeObject*> scope(cx, &proxy->as<DebugScopeObject>().scope());