diff --git a/accessible/src/base/AccCollector.h b/accessible/src/base/AccCollector.h index b2d870157362..959e098ee9e3 100644 --- a/accessible/src/base/AccCollector.h +++ b/accessible/src/base/AccCollector.h @@ -74,7 +74,7 @@ private: class EmbeddedObjCollector : public AccCollector { public: - virtual ~EmbeddedObjCollector() { }; + virtual ~EmbeddedObjCollector() { } public: virtual int32_t GetIndexAt(Accessible* aAccessible); diff --git a/accessible/src/base/AccEvent.h b/accessible/src/base/AccEvent.h index 79ef888afab3..3a5d1ffdb938 100644 --- a/accessible/src/base/AccEvent.h +++ b/accessible/src/base/AccEvent.h @@ -213,7 +213,7 @@ public: mNode = aTargetNode; mParent = mAccessible->Parent(); } - virtual ~AccMutationEvent() { }; + virtual ~AccMutationEvent() { } // Event static const EventGroup kEventGroup = eMutationEvent; @@ -291,7 +291,7 @@ public: AccReorderEvent(Accessible* aTarget) : AccEvent(::nsIAccessibleEvent::EVENT_REORDER, aTarget, eAutoDetect, eCoalesceReorder) { } - virtual ~AccReorderEvent() { }; + virtual ~AccReorderEvent() { } // Event static const EventGroup kEventGroup = eReorderEvent; diff --git a/accessible/src/base/NotificationController.h b/accessible/src/base/NotificationController.h index d9e253084dbe..7cb5402f28bf 100644 --- a/accessible/src/base/NotificationController.h +++ b/accessible/src/base/NotificationController.h @@ -28,7 +28,7 @@ class DocAccessible; class Notification { public: - virtual ~Notification() { }; + virtual ~Notification() { } NS_INLINE_DECL_REFCOUNTING(Notification) diff --git a/accessible/src/base/StyleInfo.h b/accessible/src/base/StyleInfo.h index 41db1719772e..45576d031e5a 100644 --- a/accessible/src/base/StyleInfo.h +++ b/accessible/src/base/StyleInfo.h @@ -17,7 +17,7 @@ class StyleInfo { public: StyleInfo(dom::Element* aElement, nsIPresShell* aPresShell); - ~StyleInfo() { }; + ~StyleInfo() { } void Display(nsAString& aValue); void TextAlign(nsAString& aValue); diff --git a/accessible/src/base/nsCoreUtils.h b/accessible/src/base/nsCoreUtils.h index eb210014430f..2eba55ac92f9 100644 --- a/accessible/src/base/nsCoreUtils.h +++ b/accessible/src/base/nsCoreUtils.h @@ -304,8 +304,8 @@ public: class nsAccessibleDOMStringList : public nsIDOMDOMStringList { public: - nsAccessibleDOMStringList() {}; - virtual ~nsAccessibleDOMStringList() {}; + nsAccessibleDOMStringList() {} + virtual ~nsAccessibleDOMStringList() {} NS_DECL_ISUPPORTS NS_DECL_NSIDOMDOMSTRINGLIST diff --git a/accessible/src/generic/Accessible.h b/accessible/src/generic/Accessible.h index bc143581e580..442302f5123a 100644 --- a/accessible/src/generic/Accessible.h +++ b/accessible/src/generic/Accessible.h @@ -950,7 +950,7 @@ public: KeyBinding() : mKey(0), mModifierMask(0) {} KeyBinding(uint32_t aKey, uint32_t aModifierMask) : - mKey(aKey), mModifierMask(aModifierMask) {}; + mKey(aKey), mModifierMask(aModifierMask) {} inline bool IsEmpty() const { return !mKey; } inline uint32_t Key() const { return mKey; } diff --git a/accessible/src/html/HTMLElementAccessibles.h b/accessible/src/html/HTMLElementAccessibles.h index 9250459ee953..90b1eba5f860 100644 --- a/accessible/src/html/HTMLElementAccessibles.h +++ b/accessible/src/html/HTMLElementAccessibles.h @@ -20,7 +20,7 @@ class HTMLHRAccessible : public LeafAccessible public: HTMLHRAccessible(nsIContent* aContent, DocAccessible* aDoc) : - LeafAccessible(aContent, aDoc) {}; + LeafAccessible(aContent, aDoc) {} // Accessible virtual a11y::role NativeRole(); @@ -33,7 +33,7 @@ class HTMLBRAccessible : public LeafAccessible { public: HTMLBRAccessible(nsIContent* aContent, DocAccessible* aDoc) : - LeafAccessible(aContent, aDoc) {}; + LeafAccessible(aContent, aDoc) {} // Accessible virtual a11y::role NativeRole(); @@ -52,7 +52,7 @@ class HTMLLabelAccessible : public HyperTextAccessibleWrap public: HTMLLabelAccessible(nsIContent* aContent, DocAccessible* aDoc) : - HyperTextAccessibleWrap(aContent, aDoc) {}; + HyperTextAccessibleWrap(aContent, aDoc) {} NS_DECL_ISUPPORTS_INHERITED @@ -71,7 +71,7 @@ class HTMLOutputAccessible : public HyperTextAccessibleWrap public: HTMLOutputAccessible(nsIContent* aContent, DocAccessible* aDoc) : - HyperTextAccessibleWrap(aContent, aDoc) {}; + HyperTextAccessibleWrap(aContent, aDoc) {} NS_DECL_ISUPPORTS_INHERITED diff --git a/content/base/src/nsObjectLoadingContent.h b/content/base/src/nsObjectLoadingContent.h index 79e8f431578d..e43e9d2fceea 100644 --- a/content/base/src/nsObjectLoadingContent.h +++ b/content/base/src/nsObjectLoadingContent.h @@ -131,7 +131,7 @@ class nsObjectLoadingContent : public nsImageLoadingContent * Used by pluginHost to know if we're loading with a channel, so it * will not open its own. */ - bool SrcStreamLoading() { return mSrcStreamLoading; }; + bool SrcStreamLoading() { return mSrcStreamLoading; } protected: /** diff --git a/content/media/webrtc/MediaEngine.h b/content/media/webrtc/MediaEngine.h index 165d17e71d61..391f17a9dbd5 100644 --- a/content/media/webrtc/MediaEngine.h +++ b/content/media/webrtc/MediaEngine.h @@ -31,7 +31,7 @@ enum MediaEngineState { class MediaEngine { public: - virtual ~MediaEngine() {}; + virtual ~MediaEngine() {} /* Populate an array of video sources in the nsTArray. Also include devices * that are currently unavailable. */ @@ -48,7 +48,7 @@ public: class MediaEngineSource : public nsISupports { public: - virtual ~MediaEngineSource() {}; + virtual ~MediaEngineSource() {} /* Populate the human readable name of this device in the nsAString */ virtual void GetName(nsAString&) = 0; @@ -114,7 +114,7 @@ struct MediaEngineVideoOptions { class MediaEngineVideoSource : public MediaEngineSource { public: - virtual ~MediaEngineVideoSource() {}; + virtual ~MediaEngineVideoSource() {} /* Return a MediaEngineVideoOptions struct with appropriate values for all * fields. */ @@ -127,7 +127,7 @@ public: class MediaEngineAudioSource : public MediaEngineSource { public: - virtual ~MediaEngineAudioSource() {}; + virtual ~MediaEngineAudioSource() {} }; } diff --git a/content/svg/content/src/DOMSVGLength.h b/content/svg/content/src/DOMSVGLength.h index 0be9dc1cb5e6..c7c9305d134a 100644 --- a/content/svg/content/src/DOMSVGLength.h +++ b/content/svg/content/src/DOMSVGLength.h @@ -95,7 +95,7 @@ public: if (mList) { mList->mItems[mListIndex] = nullptr; } - }; + } /** * Create an unowned copy of an owned length. The caller is responsible for diff --git a/content/svg/content/src/DOMSVGLengthList.h b/content/svg/content/src/DOMSVGLengthList.h index a01a471b5725..8ae385ff489d 100644 --- a/content/svg/content/src/DOMSVGLengthList.h +++ b/content/svg/content/src/DOMSVGLengthList.h @@ -71,7 +71,7 @@ public: if (mAList) { ( IsAnimValList() ? mAList->mAnimVal : mAList->mBaseVal ) = nullptr; } - }; + } virtual JSObject* WrapObject(JSContext *cx, JSObject *scope, bool *triedToWrap); diff --git a/content/svg/content/src/DOMSVGNumber.h b/content/svg/content/src/DOMSVGNumber.h index b86ab1f8436f..b543a7909a0e 100644 --- a/content/svg/content/src/DOMSVGNumber.h +++ b/content/svg/content/src/DOMSVGNumber.h @@ -70,7 +70,7 @@ public: if (mList) { mList->mItems[mListIndex] = nullptr; } - }; + } /** * Create an unowned copy. The caller is responsible for the first AddRef(). diff --git a/content/svg/content/src/DOMSVGTransform.h b/content/svg/content/src/DOMSVGTransform.h index ea26780a5fcf..e922ac63fdbf 100644 --- a/content/svg/content/src/DOMSVGTransform.h +++ b/content/svg/content/src/DOMSVGTransform.h @@ -81,7 +81,7 @@ public: if (mList) { mList->mItems[mListIndex] = nullptr; } - }; + } /** * Create an unowned copy of an owned transform. The caller is responsible for diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp index 7b6ffd79f140..d8c1816131eb 100644 --- a/content/xul/content/src/nsXULElement.cpp +++ b/content/xul/content/src/nsXULElement.cpp @@ -141,7 +141,7 @@ public: NS_ADDREF(*aStyle); return NS_OK; } - NS_FORWARD_NSIFRAMELOADEROWNER(static_cast(mElement.get())->); + NS_FORWARD_NSIFRAMELOADEROWNER(static_cast(mElement.get())->) private: nsCOMPtr mElement; }; diff --git a/dom/base/nsJSEnvironment.h b/dom/base/nsJSEnvironment.h index 1279ff28c7b6..3207c3f758e2 100644 --- a/dom/base/nsJSEnvironment.h +++ b/dom/base/nsJSEnvironment.h @@ -103,7 +103,7 @@ public: JSObject** aFunctionObject); virtual nsIScriptGlobalObject *GetGlobalObject(); - inline nsIScriptGlobalObject *GetGlobalObjectRef() { return mGlobalObjectRef; }; + inline nsIScriptGlobalObject *GetGlobalObjectRef() { return mGlobalObjectRef; } virtual JSContext* GetNativeContext(); virtual JSObject* GetNativeGlobal(); diff --git a/dom/media/MediaManager.h b/dom/media/MediaManager.h index 4140aee3918b..41851306964a 100644 --- a/dom/media/MediaManager.h +++ b/dom/media/MediaManager.h @@ -254,13 +254,13 @@ public: mSource = aSource; mType.Assign(NS_LITERAL_STRING("video")); mSource->GetName(mName); - }; + } MediaDevice(MediaEngineAudioSource* aSource) { mSource = aSource; mType.Assign(NS_LITERAL_STRING("audio")); mSource->GetName(mName); - }; - virtual ~MediaDevice() {}; + } + virtual ~MediaDevice() {} MediaEngineSource* GetSource(); private: @@ -317,7 +317,7 @@ private: WindowTable *GetActiveWindows() { NS_ASSERTION(NS_IsMainThread(), "Only access windowlist on main thread"); return &mActiveWindows; - }; + } // Make private because we want only one instance of this class MediaManager() @@ -326,11 +326,11 @@ private: , mBackend(nullptr) { mActiveWindows.Init(); mActiveCallbacks.Init(); - }; + } ~MediaManager() { delete mBackend; - }; + } // ONLY access from MainThread so we don't need to lock WindowTable mActiveWindows; diff --git a/editor/libeditor/html/nsWSRunObject.h b/editor/libeditor/html/nsWSRunObject.h index 5adaabf93e7d..031b122e072b 100644 --- a/editor/libeditor/html/nsWSRunObject.h +++ b/editor/libeditor/html/nsWSRunObject.h @@ -84,7 +84,7 @@ public: } private: uint16_t mEnum; - void bool_conversion_helper() {}; + void bool_conversion_helper() {} public: // Allow boolean conversion with no numeric conversion typedef void (WSType::*bool_type)(); diff --git a/image/src/Decoder.h b/image/src/Decoder.h index 0510e6a52ccd..a042776381f6 100644 --- a/image/src/Decoder.h +++ b/image/src/Decoder.h @@ -89,7 +89,7 @@ public: // If we're doing a "size decode", we more or less pass through the image // data, stopping only to scoop out the image dimensions. A size decode // must be enabled by SetSizeDecode() _before_calling Init(). - bool IsSizeDecode() { return mSizeDecode; }; + bool IsSizeDecode() { return mSizeDecode; } void SetSizeDecode(bool aSizeDecode) { NS_ABORT_IF_FALSE(!mInitialized, "Can't set size decode after Init()!"); @@ -104,10 +104,10 @@ public: uint32_t GetCompleteFrameCount() { return mInFrame ? mFrameCount - 1 : mFrameCount; } // Error tracking - bool HasError() { return HasDataError() || HasDecoderError(); }; - bool HasDataError() { return mDataError; }; - bool HasDecoderError() { return NS_FAILED(mFailCode); }; - nsresult GetDecoderError() { return mFailCode; }; + bool HasError() { return HasDataError() || HasDecoderError(); } + bool HasDataError() { return mDataError; } + bool HasDecoderError() { return NS_FAILED(mFailCode); } + nsresult GetDecoderError() { return mFailCode; } void PostResizeError() { PostDataError(); } bool GetDecodeDone() const { return mDecodeDone; diff --git a/image/src/imgRequest.h b/image/src/imgRequest.h index 00d3a6200096..4172c2d1f7f9 100644 --- a/image/src/imgRequest.h +++ b/image/src/imgRequest.h @@ -114,7 +114,7 @@ public: imgStatusTracker& GetStatusTracker(); // Get the current principal of the image. No AddRefing. - inline nsIPrincipal* GetPrincipal() const { return mPrincipal.get(); }; + inline nsIPrincipal* GetPrincipal() const { return mPrincipal.get(); } // Resize the cache entry to 0 if it exists void ResetCacheEntry(); diff --git a/image/src/imgStatusTracker.h b/image/src/imgStatusTracker.h index 9529566e218a..360d9d69f5f6 100644 --- a/image/src/imgStatusTracker.h +++ b/image/src/imgStatusTracker.h @@ -114,7 +114,7 @@ public: // with its status. Weak pointers. void AddConsumer(imgRequestProxy* aConsumer); bool RemoveConsumer(imgRequestProxy* aConsumer, nsresult aStatus); - size_t ConsumerCount() const { return mConsumers.Length(); }; + size_t ConsumerCount() const { return mConsumers.Length(); } // This is intentionally non-general because its sole purpose is to support an // some obscure network priority logic in imgRequest. That stuff could probably @@ -190,8 +190,8 @@ public: void ClearRequest(); // Weak pointer getters - no AddRefs. - inline mozilla::image::Image* GetImage() const { return mImage; }; - inline imgRequest* GetRequest() const { return mRequest; }; + inline mozilla::image::Image* GetImage() const { return mImage; } + inline imgRequest* GetRequest() const { return mRequest; } inline imgIDecoderObserver* GetDecoderObserver() { return mTrackerObserver.get(); } diff --git a/js/src/ctypes/CTypes.h b/js/src/ctypes/CTypes.h index c5ca9a617b06..027ba5a47609 100644 --- a/js/src/ctypes/CTypes.h +++ b/js/src/ctypes/CTypes.h @@ -304,7 +304,7 @@ struct ClosureInfo ffi_closure_free(closure); if (errResult) js_free(errResult); - }; + } }; bool IsCTypesGlobal(JSObject* obj); diff --git a/js/src/ion/Bailouts.h b/js/src/ion/Bailouts.h index a1f8f6362616..4924c7e81395 100644 --- a/js/src/ion/Bailouts.h +++ b/js/src/ion/Bailouts.h @@ -135,7 +135,7 @@ class BailoutClosure void constructFrame() { guards_.construct(); - }; + } InvokeArgsGuard *argsGuard() { return &guards_.ref().iag; } diff --git a/js/src/ion/BitSet.h b/js/src/ion/BitSet.h index 904b09f2fa39..03903c74a3ac 100644 --- a/js/src/ion/BitSet.h +++ b/js/src/ion/BitSet.h @@ -26,7 +26,7 @@ class BitSet : private TempObject private: BitSet(unsigned int max) : max_(max), - bits_(NULL) {}; + bits_(NULL) {} unsigned int max_; uint32_t *bits_; diff --git a/js/src/ion/FixedList.h b/js/src/ion/FixedList.h index d6f993337a06..1c2bc5c447ee 100644 --- a/js/src/ion/FixedList.h +++ b/js/src/ion/FixedList.h @@ -53,7 +53,7 @@ class FixedList const T &operator [](size_t index) const { JS_ASSERT(index < length_); return list_[index]; - }; + } }; } // namespace ion diff --git a/js/src/ion/LIR-Common.h b/js/src/ion/LIR-Common.h index 8c289cf81c05..7224eb574230 100644 --- a/js/src/ion/LIR-Common.h +++ b/js/src/ion/LIR-Common.h @@ -34,7 +34,7 @@ class LLabel : public LInstructionHelper<0, 0, 0> Label label_; public: - LIR_HEADER(Label); + LIR_HEADER(Label) Label *label() { return &label_; @@ -44,7 +44,7 @@ class LLabel : public LInstructionHelper<0, 0, 0> class LNop : public LInstructionHelper<0, 0, 0> { public: - LIR_HEADER(Nop); + LIR_HEADER(Nop) }; // An LOsiPoint captures a snapshot after a call and ensures enough space to @@ -69,7 +69,7 @@ class LOsiPoint : public LInstructionHelper<0, 0, 0> return safepoint_; } - LIR_HEADER(OsiPoint); + LIR_HEADER(OsiPoint) }; class LMove @@ -102,7 +102,7 @@ class LMoveGroup : public LInstructionHelper<0, 0, 0> js::Vector moves_; public: - LIR_HEADER(MoveGroup); + LIR_HEADER(MoveGroup) void printOperands(FILE *fp); @@ -126,7 +126,7 @@ class LInteger : public LInstructionHelper<1, 0, 0> int32_t i32_; public: - LIR_HEADER(Integer); + LIR_HEADER(Integer) LInteger(int32_t i32) : i32_(i32) @@ -151,7 +151,7 @@ class LPointer : public LInstructionHelper<1, 0, 0> Kind kind_; public: - LIR_HEADER(Pointer); + LIR_HEADER(Pointer) LPointer(gc::Cell *ptr) : ptr_(ptr), kind_(GC_THING) @@ -180,7 +180,7 @@ class LValue : public LInstructionHelper Value v_; public: - LIR_HEADER(Value); + LIR_HEADER(Value) LValue(const Value &v) : v_(v) @@ -196,14 +196,14 @@ class LValue : public LInstructionHelper class LParameter : public LInstructionHelper { public: - LIR_HEADER(Parameter); + LIR_HEADER(Parameter) }; // Stack offset for a word-sized immutable input value to a frame. class LCallee : public LInstructionHelper<1, 0, 0> { public: - LIR_HEADER(Callee); + LIR_HEADER(Callee) }; // Jumps to the start of a basic block. @@ -212,7 +212,7 @@ class LGoto : public LInstructionHelper<0, 0, 0> MBasicBlock *block_; public: - LIR_HEADER(Goto); + LIR_HEADER(Goto) LGoto(MBasicBlock *block) : block_(block) @@ -226,7 +226,7 @@ class LGoto : public LInstructionHelper<0, 0, 0> class LNewSlots : public LCallInstructionHelper<1, 0, 3> { public: - LIR_HEADER(NewSlots); + LIR_HEADER(NewSlots) LNewSlots(const LDefinition &temp1, const LDefinition &temp2, const LDefinition &temp3) { setTemp(0, temp1); @@ -252,7 +252,7 @@ class LNewSlots : public LCallInstructionHelper<1, 0, 3> class LNewArray : public LInstructionHelper<1, 0, 0> { public: - LIR_HEADER(NewArray); + LIR_HEADER(NewArray) MNewArray *mir() const { return mir_->toNewArray(); @@ -262,7 +262,7 @@ class LNewArray : public LInstructionHelper<1, 0, 0> class LNewObject : public LInstructionHelper<1, 0, 0> { public: - LIR_HEADER(NewObject); + LIR_HEADER(NewObject) MNewObject *mir() const { return mir_->toNewObject(); @@ -297,7 +297,7 @@ class LNewDeclEnvObject : public LInstructionHelper<1, 0, 0> class LNewCallObject : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(NewCallObject); + LIR_HEADER(NewCallObject) LNewCallObject(const LAllocation &slots) { setOperand(0, slots); @@ -314,7 +314,7 @@ class LNewCallObject : public LInstructionHelper<1, 1, 0> class LNewStringObject : public LInstructionHelper<1, 1, 1> { public: - LIR_HEADER(NewStringObject); + LIR_HEADER(NewStringObject) LNewStringObject(const LAllocation &input, const LDefinition &temp) { setOperand(0, input); @@ -336,7 +336,7 @@ class LNewStringObject : public LInstructionHelper<1, 1, 1> class LInitProp : public LCallInstructionHelper<0, 1 + BOX_PIECES, 0> { public: - LIR_HEADER(InitProp); + LIR_HEADER(InitProp) LInitProp(const LAllocation &object) { setOperand(0, object); @@ -359,7 +359,7 @@ class LInitProp : public LCallInstructionHelper<0, 1 + BOX_PIECES, 0> class LCheckOverRecursed : public LInstructionHelper<0, 0, 1> { public: - LIR_HEADER(CheckOverRecursed); + LIR_HEADER(CheckOverRecursed) LCheckOverRecursed(const LDefinition &limitreg) { @@ -374,7 +374,7 @@ class LCheckOverRecursed : public LInstructionHelper<0, 0, 1> class LDefVar : public LCallInstructionHelper<0, 1, 1> { public: - LIR_HEADER(DefVar); + LIR_HEADER(DefVar) LDefVar(const LAllocation &scopeChain, const LDefinition &namereg) { @@ -396,7 +396,7 @@ class LDefVar : public LCallInstructionHelper<0, 1, 1> class LTypeOfV : public LInstructionHelper<1, BOX_PIECES, 0> { public: - LIR_HEADER(TypeOfV); + LIR_HEADER(TypeOfV) static const size_t Input = 0; @@ -408,7 +408,7 @@ class LTypeOfV : public LInstructionHelper<1, BOX_PIECES, 0> class LToIdV : public LCallInstructionHelper { public: - LIR_HEADER(ToIdV); + LIR_HEADER(ToIdV) static const size_t Object = 0; static const size_t Index = BOX_PIECES; @@ -423,7 +423,7 @@ class LToIdV : public LCallInstructionHelper class LCreateThis : public LInstructionHelper<1, 0, 0> { public: - LIR_HEADER(CreateThis); + LIR_HEADER(CreateThis) LCreateThis() { } @@ -437,7 +437,7 @@ class LCreateThis : public LInstructionHelper<1, 0, 0> class LCreateThisVM : public LCallInstructionHelper<1, 2, 0> { public: - LIR_HEADER(CreateThisVM); + LIR_HEADER(CreateThisVM) LCreateThisVM(const LAllocation &callee, const LAllocation &prototype) { @@ -462,7 +462,7 @@ class LCreateThisVM : public LCallInstructionHelper<1, 2, 0> class LReturnFromCtor : public LInstructionHelper<1, BOX_PIECES + 1, 0> { public: - LIR_HEADER(ReturnFromCtor); + LIR_HEADER(ReturnFromCtor) LReturnFromCtor(const LAllocation &object) { @@ -484,7 +484,7 @@ class LStackArgT : public LInstructionHelper<0, 1, 0> uint32_t argslot_; // Index into frame-scope argument vector. public: - LIR_HEADER(StackArgT); + LIR_HEADER(StackArgT) LStackArgT(uint32_t argslot, const LAllocation &arg) : argslot_(argslot) @@ -509,7 +509,7 @@ class LStackArgV : public LInstructionHelper<0, BOX_PIECES, 0> uint32_t argslot_; // Index into frame-scope argument vector. public: - LIR_HEADER(StackArgV); + LIR_HEADER(StackArgV) LStackArgV(uint32_t argslot) : argslot_(argslot) @@ -568,7 +568,7 @@ class LJSCallInstructionHelper : public LCallInstructionHelper { public: - LIR_HEADER(CallGeneric); + LIR_HEADER(CallGeneric) LCallGeneric(const LAllocation &func, uint32_t argslot, const LDefinition &nargsreg, const LDefinition &tmpobjreg) @@ -594,7 +594,7 @@ class LCallGeneric : public LJSCallInstructionHelper class LCallKnown : public LJSCallInstructionHelper { public: - LIR_HEADER(CallKnown); + LIR_HEADER(CallKnown) LCallKnown(const LAllocation &func, uint32_t argslot, const LDefinition &tmpobjreg) : JSCallHelper(argslot) @@ -615,7 +615,7 @@ class LCallKnown : public LJSCallInstructionHelper class LCallNative : public LJSCallInstructionHelper { public: - LIR_HEADER(CallNative); + LIR_HEADER(CallNative) LCallNative(uint32_t argslot, const LDefinition &argJSContext, const LDefinition &argUintN, @@ -649,7 +649,7 @@ class LCallNative : public LJSCallInstructionHelper class LCallDOMNative : public LJSCallInstructionHelper { public: - LIR_HEADER(CallDOMNative); + LIR_HEADER(CallDOMNative) LCallDOMNative(uint32_t argslot, const LDefinition &argJSContext, const LDefinition &argObj, @@ -686,7 +686,7 @@ class LCallDOMNative : public LJSCallInstructionHelper class LCallConstructor : public LJSCallInstructionHelper { public: - LIR_HEADER(CallConstructor); + LIR_HEADER(CallConstructor) LCallConstructor(const LAllocation &func, uint32_t argslot) : JSCallHelper(argslot) @@ -731,7 +731,7 @@ class LDOMPropertyInstructionHelper : public LCallInstructionHelper { public: - LIR_HEADER(GetDOMProperty); + LIR_HEADER(GetDOMProperty) LGetDOMProperty(const LDefinition &JSContextReg, const LAllocation &ObjectReg, const LDefinition &PrivReg, const LDefinition &ValueReg) @@ -747,7 +747,7 @@ class LGetDOMProperty : public LDOMPropertyInstructionHelper class LSetDOMProperty : public LDOMPropertyInstructionHelper<0, BOX_PIECES> { public: - LIR_HEADER(SetDOMProperty); + LIR_HEADER(SetDOMProperty) LSetDOMProperty(const LDefinition &JSContextReg, const LAllocation &ObjectReg, const LDefinition &PrivReg, const LDefinition &ValueReg) @@ -767,7 +767,7 @@ class LSetDOMProperty : public LDOMPropertyInstructionHelper<0, BOX_PIECES> class LApplyArgsGeneric : public LCallInstructionHelper { public: - LIR_HEADER(ApplyArgsGeneric); + LIR_HEADER(ApplyArgsGeneric) LApplyArgsGeneric(const LAllocation &func, const LAllocation &argc, const LDefinition &tmpobjreg, const LDefinition &tmpcopy) @@ -812,7 +812,7 @@ class LTestIAndBranch : public LInstructionHelper<0, 1, 0> MBasicBlock *ifFalse_; public: - LIR_HEADER(TestIAndBranch); + LIR_HEADER(TestIAndBranch) LTestIAndBranch(const LAllocation &in, MBasicBlock *ifTrue, MBasicBlock *ifFalse) : ifTrue_(ifTrue), @@ -836,7 +836,7 @@ class LTestDAndBranch : public LInstructionHelper<0, 1, 1> MBasicBlock *ifFalse_; public: - LIR_HEADER(TestDAndBranch); + LIR_HEADER(TestDAndBranch) LTestDAndBranch(const LAllocation &in, MBasicBlock *ifTrue, MBasicBlock *ifFalse) : ifTrue_(ifTrue), @@ -860,7 +860,7 @@ class LTestVAndBranch : public LInstructionHelper<0, BOX_PIECES, 1> MBasicBlock *ifFalse_; public: - LIR_HEADER(TestVAndBranch); + LIR_HEADER(TestVAndBranch) LTestVAndBranch(MBasicBlock *ifTrue, MBasicBlock *ifFalse, const LDefinition &temp) : ifTrue_(ifTrue), @@ -883,7 +883,7 @@ class LPolyInlineDispatch : public LInstructionHelper<0, 1, 1> { // Accesses function/block table from MIR instruction. public: - LIR_HEADER(PolyInlineDispatch); + LIR_HEADER(PolyInlineDispatch) LPolyInlineDispatch(const LAllocation &in, const LDefinition &temp) { setOperand(0, in); @@ -907,7 +907,7 @@ class LCompare : public LInstructionHelper<1, 2, 0> JSOp jsop_; public: - LIR_HEADER(Compare); + LIR_HEADER(Compare) LCompare(JSOp jsop, const LAllocation &left, const LAllocation &right) : jsop_(jsop) { @@ -932,7 +932,7 @@ class LCompare : public LInstructionHelper<1, 2, 0> class LCompareD : public LInstructionHelper<1, 2, 0> { public: - LIR_HEADER(CompareD); + LIR_HEADER(CompareD) LCompareD(const LAllocation &left, const LAllocation &right) { setOperand(0, left); setOperand(1, right); @@ -952,7 +952,7 @@ class LCompareD : public LInstructionHelper<1, 2, 0> class LCompareS : public LInstructionHelper<1, 2, 1> { public: - LIR_HEADER(CompareS); + LIR_HEADER(CompareS) LCompareS(const LAllocation &left, const LAllocation &right, const LDefinition &temp) { setOperand(0, left); @@ -977,7 +977,7 @@ class LCompareS : public LInstructionHelper<1, 2, 1> class LCompareV : public LCallInstructionHelper<1, 2 * BOX_PIECES, 0> { public: - LIR_HEADER(CompareV); + LIR_HEADER(CompareV) static const size_t LhsInput = 0; static const size_t RhsInput = BOX_PIECES; @@ -996,7 +996,7 @@ class LCompareAndBranch : public LInstructionHelper<0, 2, 0> MBasicBlock *ifFalse_; public: - LIR_HEADER(CompareAndBranch); + LIR_HEADER(CompareAndBranch) LCompareAndBranch(JSOp jsop, const LAllocation &left, const LAllocation &right, MBasicBlock *ifTrue, MBasicBlock *ifFalse) : jsop_(jsop), @@ -1033,7 +1033,7 @@ class LCompareDAndBranch : public LInstructionHelper<0, 2, 0> MBasicBlock *ifFalse_; public: - LIR_HEADER(CompareDAndBranch); + LIR_HEADER(CompareDAndBranch) LCompareDAndBranch(const LAllocation &left, const LAllocation &right, MBasicBlock *ifTrue, MBasicBlock *ifFalse) : ifTrue_(ifTrue), @@ -1066,7 +1066,7 @@ class LCompareDAndBranch : public LInstructionHelper<0, 2, 0> class LCompareB : public LInstructionHelper<1, BOX_PIECES + 1, 0> { public: - LIR_HEADER(CompareB); + LIR_HEADER(CompareB) LCompareB(const LAllocation &rhs) { setOperand(BOX_PIECES, rhs); @@ -1089,7 +1089,7 @@ class LCompareBAndBranch : public LInstructionHelper<0, BOX_PIECES + 1, 0> MBasicBlock *ifFalse_; public: - LIR_HEADER(CompareBAndBranch); + LIR_HEADER(CompareBAndBranch) LCompareBAndBranch(const LAllocation &rhs, MBasicBlock *ifTrue, MBasicBlock *ifFalse) : ifTrue_(ifTrue), ifFalse_(ifFalse) @@ -1117,7 +1117,7 @@ class LCompareBAndBranch : public LInstructionHelper<0, BOX_PIECES + 1, 0> class LIsNullOrUndefined : public LInstructionHelper<1, BOX_PIECES, 0> { public: - LIR_HEADER(IsNullOrUndefined); + LIR_HEADER(IsNullOrUndefined) static const size_t Value = 0; @@ -1132,7 +1132,7 @@ class LIsNullOrUndefinedAndBranch : public LInstructionHelper<0, BOX_PIECES, 0> MBasicBlock *ifFalse_; public: - LIR_HEADER(IsNullOrUndefinedAndBranch); + LIR_HEADER(IsNullOrUndefinedAndBranch) LIsNullOrUndefinedAndBranch(MBasicBlock *ifTrue, MBasicBlock *ifFalse) : ifTrue_(ifTrue), ifFalse_(ifFalse) @@ -1155,7 +1155,7 @@ class LIsNullOrUndefinedAndBranch : public LInstructionHelper<0, BOX_PIECES, 0> class LNotI : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(NotI); + LIR_HEADER(NotI) LNotI(const LAllocation &input) { setOperand(0, input); @@ -1166,7 +1166,7 @@ class LNotI : public LInstructionHelper<1, 1, 0> class LNotD : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(NotD); + LIR_HEADER(NotD) LNotD(const LAllocation &input) { setOperand(0, input); @@ -1177,7 +1177,7 @@ class LNotD : public LInstructionHelper<1, 1, 0> class LNotV : public LInstructionHelper<1, BOX_PIECES, 1> { public: - LIR_HEADER(NotV); + LIR_HEADER(NotV) static const size_t Input = 0; LNotV(const LDefinition &temp) @@ -1195,14 +1195,14 @@ class LNotV : public LInstructionHelper<1, BOX_PIECES, 1> class LBitNotI : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(BitNotI); + LIR_HEADER(BitNotI) }; // Call a VM function to perform a BITNOT operation. class LBitNotV : public LCallInstructionHelper<1, BOX_PIECES, 0> { public: - LIR_HEADER(BitNotV); + LIR_HEADER(BitNotV) static const size_t Input = 0; }; @@ -1214,7 +1214,7 @@ class LBitOpI : public LInstructionHelper<1, 2, 0> JSOp op_; public: - LIR_HEADER(BitOpI); + LIR_HEADER(BitOpI) LBitOpI(JSOp op) : op_(op) @@ -1231,7 +1231,7 @@ class LBitOpV : public LCallInstructionHelper<1, 2 * BOX_PIECES, 0> JSOp jsop_; public: - LIR_HEADER(BitOpV); + LIR_HEADER(BitOpV) LBitOpV(JSOp jsop) : jsop_(jsop) @@ -1252,7 +1252,7 @@ class LShiftI : public LBinaryMath<0> JSOp op_; public: - LIR_HEADER(ShiftI); + LIR_HEADER(ShiftI) LShiftI(JSOp op) : op_(op) @@ -1270,7 +1270,7 @@ class LShiftI : public LBinaryMath<0> class LUrshD : public LBinaryMath<1> { public: - LIR_HEADER(UrshD); + LIR_HEADER(UrshD) LUrshD(const LAllocation &lhs, const LAllocation &rhs, const LDefinition &temp) { setOperand(0, lhs); @@ -1287,13 +1287,13 @@ class LUrshD : public LBinaryMath<1> class LReturn : public LInstructionHelper<0, BOX_PIECES, 0> { public: - LIR_HEADER(Return); + LIR_HEADER(Return) }; class LThrow : public LCallInstructionHelper<0, BOX_PIECES, 0> { public: - LIR_HEADER(Throw); + LIR_HEADER(Throw) static const size_t Value = 0; }; @@ -1301,7 +1301,7 @@ class LThrow : public LCallInstructionHelper<0, BOX_PIECES, 0> class LMinMaxI : public LInstructionHelper<1, 2, 0> { public: - LIR_HEADER(MinMaxI); + LIR_HEADER(MinMaxI) LMinMaxI(const LAllocation &first, const LAllocation &second) { setOperand(0, first); @@ -1325,7 +1325,7 @@ class LMinMaxI : public LInstructionHelper<1, 2, 0> class LMinMaxD : public LInstructionHelper<1, 2, 0> { public: - LIR_HEADER(MinMaxD); + LIR_HEADER(MinMaxD) LMinMaxD(const LAllocation &first, const LAllocation &second) { setOperand(0, first); @@ -1350,7 +1350,7 @@ class LMinMaxD : public LInstructionHelper<1, 2, 0> class LNegD : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(NegD); + LIR_HEADER(NegD) LNegD(const LAllocation &num) { setOperand(0, num); } @@ -1360,7 +1360,7 @@ class LNegD : public LInstructionHelper<1, 1, 0> class LAbsI : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(AbsI); + LIR_HEADER(AbsI) LAbsI(const LAllocation &num) { setOperand(0, num); } @@ -1370,7 +1370,7 @@ class LAbsI : public LInstructionHelper<1, 1, 0> class LAbsD : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(AbsD); + LIR_HEADER(AbsD) LAbsD(const LAllocation &num) { setOperand(0, num); } @@ -1380,7 +1380,7 @@ class LAbsD : public LInstructionHelper<1, 1, 0> class LSqrtD : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(SqrtD); + LIR_HEADER(SqrtD) LSqrtD(const LAllocation &num) { setOperand(0, num); } @@ -1390,7 +1390,7 @@ class LSqrtD : public LInstructionHelper<1, 1, 0> class LPowI : public LCallInstructionHelper<1, 2, 1> { public: - LIR_HEADER(PowI); + LIR_HEADER(PowI) LPowI(const LAllocation &value, const LAllocation &power, const LDefinition &temp) { setOperand(0, value); setOperand(1, power); @@ -1412,7 +1412,7 @@ class LPowI : public LCallInstructionHelper<1, 2, 1> class LPowD : public LCallInstructionHelper<1, 2, 1> { public: - LIR_HEADER(PowD); + LIR_HEADER(PowD) LPowD(const LAllocation &value, const LAllocation &power, const LDefinition &temp) { setOperand(0, value); setOperand(1, power); @@ -1434,7 +1434,7 @@ class LPowD : public LCallInstructionHelper<1, 2, 1> class LRandom : public LCallInstructionHelper<1, 0, 2> { public: - LIR_HEADER(Random); + LIR_HEADER(Random) LRandom(const LDefinition &temp, const LDefinition &temp2) { setTemp(0, temp); setTemp(1, temp2); @@ -1450,7 +1450,7 @@ class LRandom : public LCallInstructionHelper<1, 0, 2> class LMathFunctionD : public LCallInstructionHelper<1, 1, 1> { public: - LIR_HEADER(MathFunctionD); + LIR_HEADER(MathFunctionD) LMathFunctionD(const LAllocation &input, const LDefinition &temp) { setOperand(0, input); setTemp(0, temp); @@ -1470,7 +1470,7 @@ class LAddI : public LBinaryMath<0> bool recoversInput_; public: - LIR_HEADER(AddI); + LIR_HEADER(AddI) LAddI() : recoversInput_(false) @@ -1490,7 +1490,7 @@ class LSubI : public LBinaryMath<0> bool recoversInput_; public: - LIR_HEADER(SubI); + LIR_HEADER(SubI) LSubI() : recoversInput_(false) @@ -1510,7 +1510,7 @@ class LMathD : public LBinaryMath<0> JSOp jsop_; public: - LIR_HEADER(MathD); + LIR_HEADER(MathD) LMathD(JSOp jsop) : jsop_(jsop) @@ -1524,7 +1524,7 @@ class LMathD : public LBinaryMath<0> class LModD : public LBinaryMath<1> { public: - LIR_HEADER(ModD); + LIR_HEADER(ModD) LModD(const LAllocation &lhs, const LAllocation &rhs, const LDefinition &temp) { setOperand(0, lhs); @@ -1545,8 +1545,8 @@ class LBinaryV : public LCallInstructionHelper JSOp jsop_; public: - LIR_HEADER(BinaryV); - BOX_OUTPUT_ACCESSORS(); + LIR_HEADER(BinaryV) + BOX_OUTPUT_ACCESSORS() LBinaryV(JSOp jsop) : jsop_(jsop) @@ -1564,7 +1564,7 @@ class LBinaryV : public LCallInstructionHelper class LConcat : public LCallInstructionHelper<1, 2, 0> { public: - LIR_HEADER(Concat); + LIR_HEADER(Concat) LConcat(const LAllocation &lhs, const LAllocation &rhs) { setOperand(0, lhs); @@ -1583,7 +1583,7 @@ class LConcat : public LCallInstructionHelper<1, 2, 0> class LCharCodeAt : public LInstructionHelper<1, 2, 0> { public: - LIR_HEADER(CharCodeAt); + LIR_HEADER(CharCodeAt) LCharCodeAt(const LAllocation &str, const LAllocation &index) { setOperand(0, str); @@ -1602,7 +1602,7 @@ class LCharCodeAt : public LInstructionHelper<1, 2, 0> class LFromCharCode : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(FromCharCode); + LIR_HEADER(FromCharCode) LFromCharCode(const LAllocation &code) { setOperand(0, code); @@ -1617,7 +1617,7 @@ class LFromCharCode : public LInstructionHelper<1, 1, 0> class LInt32ToDouble : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(Int32ToDouble); + LIR_HEADER(Int32ToDouble) LInt32ToDouble(const LAllocation &input) { setOperand(0, input); @@ -1628,7 +1628,7 @@ class LInt32ToDouble : public LInstructionHelper<1, 1, 0> class LValueToDouble : public LInstructionHelper<1, BOX_PIECES, 0> { public: - LIR_HEADER(ValueToDouble); + LIR_HEADER(ValueToDouble) static const size_t Input = 0; }; @@ -1651,7 +1651,7 @@ class LValueToInt32 : public LInstructionHelper<1, BOX_PIECES, 1> Mode mode_; public: - LIR_HEADER(ValueToInt32); + LIR_HEADER(ValueToInt32) LValueToInt32(const LDefinition &temp, Mode mode) : mode_(mode) @@ -1679,7 +1679,7 @@ class LValueToInt32 : public LInstructionHelper<1, BOX_PIECES, 1> class LDoubleToInt32 : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(DoubleToInt32); + LIR_HEADER(DoubleToInt32) LDoubleToInt32(const LAllocation &in) { setOperand(0, in); @@ -1697,7 +1697,7 @@ class LDoubleToInt32 : public LInstructionHelper<1, 1, 0> class LTruncateDToInt32 : public LInstructionHelper<1, 1, 1> { public: - LIR_HEADER(TruncateDToInt32); + LIR_HEADER(TruncateDToInt32) LTruncateDToInt32(const LAllocation &in, const LDefinition &temp) { setOperand(0, in); @@ -1714,7 +1714,7 @@ class LTruncateDToInt32 : public LInstructionHelper<1, 1, 1> class LIntToString : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(IntToString); + LIR_HEADER(IntToString) LIntToString(const LAllocation &input) { setOperand(0, input); @@ -1731,7 +1731,7 @@ class LIntToString : public LInstructionHelper<1, 1, 0> class LStart : public LInstructionHelper<0, 0, 0> { public: - LIR_HEADER(Start); + LIR_HEADER(Start) }; // Passed the StackFrame address in the OsrFrameReg by SideCannon(). @@ -1743,7 +1743,7 @@ class LOsrEntry : public LInstructionHelper<1, 0, 0> uint32_t frameDepth_; public: - LIR_HEADER(OsrEntry); + LIR_HEADER(OsrEntry) LOsrEntry() : frameDepth_(0) @@ -1765,7 +1765,7 @@ class LOsrEntry : public LInstructionHelper<1, 0, 0> class LOsrValue : public LInstructionHelper { public: - LIR_HEADER(OsrValue); + LIR_HEADER(OsrValue) LOsrValue(const LAllocation &entry) { @@ -1781,7 +1781,7 @@ class LOsrValue : public LInstructionHelper class LOsrScopeChain : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(OsrScopeChain); + LIR_HEADER(OsrScopeChain) LOsrScopeChain(const LAllocation &entry) { @@ -1796,7 +1796,7 @@ class LOsrScopeChain : public LInstructionHelper<1, 1, 0> class LRegExp : public LCallInstructionHelper<1, 0, 0> { public: - LIR_HEADER(RegExp); + LIR_HEADER(RegExp) const MRegExp *mir() const { return mir_->toRegExp(); @@ -1806,7 +1806,7 @@ class LRegExp : public LCallInstructionHelper<1, 0, 0> class LRegExpTest : public LCallInstructionHelper<1, 2, 0> { public: - LIR_HEADER(RegExpTest); + LIR_HEADER(RegExpTest) LRegExpTest(const LAllocation ®exp, const LAllocation &string) { @@ -1829,7 +1829,7 @@ class LRegExpTest : public LCallInstructionHelper<1, 2, 0> class LLambdaForSingleton : public LCallInstructionHelper<1, 1, 0> { public: - LIR_HEADER(LambdaForSingleton); + LIR_HEADER(LambdaForSingleton) LLambdaForSingleton(const LAllocation &scopeChain) { @@ -1846,7 +1846,7 @@ class LLambdaForSingleton : public LCallInstructionHelper<1, 1, 0> class LLambda : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(Lambda); + LIR_HEADER(Lambda) LLambda(const LAllocation &scopeChain) { setOperand(0, scopeChain); @@ -1863,8 +1863,8 @@ class LLambda : public LInstructionHelper<1, 1, 0> class LImplicitThis : public LInstructionHelper { public: - LIR_HEADER(ImplicitThis); - BOX_OUTPUT_ACCESSORS(); + LIR_HEADER(ImplicitThis) + BOX_OUTPUT_ACCESSORS() LImplicitThis(const LAllocation &callee) { setOperand(0, callee); @@ -1884,7 +1884,7 @@ class LImplicitThis : public LInstructionHelper class LSlots : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(Slots); + LIR_HEADER(Slots) LSlots(const LAllocation &object) { setOperand(0, object); @@ -1901,7 +1901,7 @@ class LSlots : public LInstructionHelper<1, 1, 0> class LElements : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(Elements); + LIR_HEADER(Elements) LElements(const LAllocation &object) { setOperand(0, object); @@ -1916,7 +1916,7 @@ class LElements : public LInstructionHelper<1, 1, 0> class LInitializedLength : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(InitializedLength); + LIR_HEADER(InitializedLength) LInitializedLength(const LAllocation &elements) { setOperand(0, elements); @@ -1931,7 +1931,7 @@ class LInitializedLength : public LInstructionHelper<1, 1, 0> class LSetInitializedLength : public LInstructionHelper<0, 2, 0> { public: - LIR_HEADER(SetInitializedLength); + LIR_HEADER(SetInitializedLength) LSetInitializedLength(const LAllocation &elements, const LAllocation &index) { setOperand(0, elements); @@ -1950,7 +1950,7 @@ class LSetInitializedLength : public LInstructionHelper<0, 2, 0> class LArrayLength : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(ArrayLength); + LIR_HEADER(ArrayLength) LArrayLength(const LAllocation &elements) { setOperand(0, elements); @@ -1965,7 +1965,7 @@ class LArrayLength : public LInstructionHelper<1, 1, 0> class LTypedArrayLength : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(TypedArrayLength); + LIR_HEADER(TypedArrayLength) LTypedArrayLength(const LAllocation &obj) { setOperand(0, obj); @@ -1980,7 +1980,7 @@ class LTypedArrayLength : public LInstructionHelper<1, 1, 0> class LTypedArrayElements : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(TypedArrayElements); + LIR_HEADER(TypedArrayElements) LTypedArrayElements(const LAllocation &object) { setOperand(0, object); @@ -1994,7 +1994,7 @@ class LTypedArrayElements : public LInstructionHelper<1, 1, 0> class LBoundsCheck : public LInstructionHelper<0, 2, 0> { public: - LIR_HEADER(BoundsCheck); + LIR_HEADER(BoundsCheck) LBoundsCheck(const LAllocation &index, const LAllocation &length) { setOperand(0, index); @@ -2015,7 +2015,7 @@ class LBoundsCheck : public LInstructionHelper<0, 2, 0> class LBoundsCheckRange : public LInstructionHelper<0, 2, 1> { public: - LIR_HEADER(BoundsCheckRange); + LIR_HEADER(BoundsCheckRange) LBoundsCheckRange(const LAllocation &index, const LAllocation &length, const LDefinition &temp) @@ -2039,7 +2039,7 @@ class LBoundsCheckRange : public LInstructionHelper<0, 2, 1> class LBoundsCheckLower : public LInstructionHelper<0, 1, 0> { public: - LIR_HEADER(BoundsCheckLower); + LIR_HEADER(BoundsCheckLower) LBoundsCheckLower(const LAllocation &index) { @@ -2057,8 +2057,8 @@ class LBoundsCheckLower : public LInstructionHelper<0, 1, 0> class LLoadElementV : public LInstructionHelper { public: - LIR_HEADER(LoadElementV); - BOX_OUTPUT_ACCESSORS(); + LIR_HEADER(LoadElementV) + BOX_OUTPUT_ACCESSORS() LLoadElementV(const LAllocation &elements, const LAllocation &index) { setOperand(0, elements); @@ -2078,7 +2078,7 @@ class LLoadElementV : public LInstructionHelper class LInArray : public LInstructionHelper<1, 3, 0> { public: - LIR_HEADER(InArray); + LIR_HEADER(InArray) LInArray(const LAllocation &elements, const LAllocation &index, const LAllocation &initLength) { setOperand(0, elements); @@ -2104,8 +2104,8 @@ class LInArray : public LInstructionHelper<1, 3, 0> class LLoadElementHole : public LInstructionHelper { public: - LIR_HEADER(LoadElementHole); - BOX_OUTPUT_ACCESSORS(); + LIR_HEADER(LoadElementHole) + BOX_OUTPUT_ACCESSORS() LLoadElementHole(const LAllocation &elements, const LAllocation &index, const LAllocation &initLength) { setOperand(0, elements); @@ -2133,7 +2133,7 @@ class LLoadElementHole : public LInstructionHelper class LLoadElementT : public LInstructionHelper<1, 2, 0> { public: - LIR_HEADER(LoadElementT); + LIR_HEADER(LoadElementT) LLoadElementT(const LAllocation &elements, const LAllocation &index) { setOperand(0, elements); @@ -2154,7 +2154,7 @@ class LLoadElementT : public LInstructionHelper<1, 2, 0> class LStoreElementV : public LInstructionHelper<0, 2 + BOX_PIECES, 0> { public: - LIR_HEADER(StoreElementV); + LIR_HEADER(StoreElementV) LStoreElementV(const LAllocation &elements, const LAllocation &index) { setOperand(0, elements); @@ -2181,7 +2181,7 @@ class LStoreElementV : public LInstructionHelper<0, 2 + BOX_PIECES, 0> class LStoreElementT : public LInstructionHelper<0, 3, 0> { public: - LIR_HEADER(StoreElementT); + LIR_HEADER(StoreElementT) LStoreElementT(const LAllocation &elements, const LAllocation &index, const LAllocation &value) { setOperand(0, elements); @@ -2207,7 +2207,7 @@ class LStoreElementT : public LInstructionHelper<0, 3, 0> class LStoreElementHoleV : public LInstructionHelper<0, 3 + BOX_PIECES, 0> { public: - LIR_HEADER(StoreElementHoleV); + LIR_HEADER(StoreElementHoleV) LStoreElementHoleV(const LAllocation &object, const LAllocation &elements, const LAllocation &index) { @@ -2236,7 +2236,7 @@ class LStoreElementHoleV : public LInstructionHelper<0, 3 + BOX_PIECES, 0> class LStoreElementHoleT : public LInstructionHelper<0, 4, 0> { public: - LIR_HEADER(StoreElementHoleT); + LIR_HEADER(StoreElementHoleT) LStoreElementHoleT(const LAllocation &object, const LAllocation &elements, const LAllocation &index, const LAllocation &value) { @@ -2266,7 +2266,7 @@ class LStoreElementHoleT : public LInstructionHelper<0, 4, 0> class LArrayPopShiftV : public LInstructionHelper { public: - LIR_HEADER(ArrayPopShiftV); + LIR_HEADER(ArrayPopShiftV) LArrayPopShiftV(const LAllocation &object, const LDefinition &temp0, const LDefinition &temp1) { setOperand(0, object); @@ -2291,7 +2291,7 @@ class LArrayPopShiftV : public LInstructionHelper class LArrayPopShiftT : public LInstructionHelper<1, 1, 2> { public: - LIR_HEADER(ArrayPopShiftT); + LIR_HEADER(ArrayPopShiftT) LArrayPopShiftT(const LAllocation &object, const LDefinition &temp0, const LDefinition &temp1) { setOperand(0, object); @@ -2316,7 +2316,7 @@ class LArrayPopShiftT : public LInstructionHelper<1, 1, 2> class LArrayPushV : public LInstructionHelper<1, 1 + BOX_PIECES, 1> { public: - LIR_HEADER(ArrayPushV); + LIR_HEADER(ArrayPushV) LArrayPushV(const LAllocation &object, const LDefinition &temp) { setOperand(0, object); @@ -2339,7 +2339,7 @@ class LArrayPushV : public LInstructionHelper<1, 1 + BOX_PIECES, 1> class LArrayPushT : public LInstructionHelper<1, 2, 1> { public: - LIR_HEADER(ArrayPushT); + LIR_HEADER(ArrayPushT) LArrayPushT(const LAllocation &object, const LAllocation &value, const LDefinition &temp) { setOperand(0, object); @@ -2364,7 +2364,7 @@ class LArrayPushT : public LInstructionHelper<1, 2, 1> class LArrayConcat : public LCallInstructionHelper<1, 2, 2> { public: - LIR_HEADER(ArrayConcat); + LIR_HEADER(ArrayConcat) LArrayConcat(const LAllocation &lhs, const LAllocation &rhs, const LDefinition &temp1, const LDefinition &temp2) { @@ -2394,7 +2394,7 @@ class LArrayConcat : public LCallInstructionHelper<1, 2, 2> class LLoadTypedArrayElement : public LInstructionHelper<1, 2, 1> { public: - LIR_HEADER(LoadTypedArrayElement); + LIR_HEADER(LoadTypedArrayElement) LLoadTypedArrayElement(const LAllocation &elements, const LAllocation &index, const LDefinition &temp) { @@ -2419,8 +2419,8 @@ class LLoadTypedArrayElement : public LInstructionHelper<1, 2, 1> class LLoadTypedArrayElementHole : public LInstructionHelper { public: - LIR_HEADER(LoadTypedArrayElementHole); - BOX_OUTPUT_ACCESSORS(); + LIR_HEADER(LoadTypedArrayElementHole) + BOX_OUTPUT_ACCESSORS() LLoadTypedArrayElementHole(const LAllocation &object, const LAllocation &index) { setOperand(0, object); @@ -2440,7 +2440,7 @@ class LLoadTypedArrayElementHole : public LInstructionHelper class LStoreTypedArrayElement : public LInstructionHelper<0, 3, 0> { public: - LIR_HEADER(StoreTypedArrayElement); + LIR_HEADER(StoreTypedArrayElement) LStoreTypedArrayElement(const LAllocation &elements, const LAllocation &index, const LAllocation &value) { @@ -2466,7 +2466,7 @@ class LStoreTypedArrayElement : public LInstructionHelper<0, 3, 0> class LClampIToUint8 : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(ClampIToUint8); + LIR_HEADER(ClampIToUint8) LClampIToUint8(const LAllocation &in) { setOperand(0, in); @@ -2476,7 +2476,7 @@ class LClampIToUint8 : public LInstructionHelper<1, 1, 0> class LClampDToUint8 : public LInstructionHelper<1, 1, 1> { public: - LIR_HEADER(ClampDToUint8); + LIR_HEADER(ClampDToUint8) LClampDToUint8(const LAllocation &in, const LDefinition &temp) { setOperand(0, in); @@ -2487,7 +2487,7 @@ class LClampDToUint8 : public LInstructionHelper<1, 1, 1> class LClampVToUint8 : public LInstructionHelper<1, BOX_PIECES, 1> { public: - LIR_HEADER(ClampVToUint8); + LIR_HEADER(ClampVToUint8) LClampVToUint8(const LDefinition &tempFloat) { setTemp(0, tempFloat); @@ -2504,8 +2504,8 @@ class LClampVToUint8 : public LInstructionHelper<1, BOX_PIECES, 1> class LLoadFixedSlotV : public LInstructionHelper { public: - LIR_HEADER(LoadFixedSlotV); - BOX_OUTPUT_ACCESSORS(); + LIR_HEADER(LoadFixedSlotV) + BOX_OUTPUT_ACCESSORS() LLoadFixedSlotV(const LAllocation &object) { setOperand(0, object); @@ -2519,7 +2519,7 @@ class LLoadFixedSlotV : public LInstructionHelper class LLoadFixedSlotT : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(LoadFixedSlotT); + LIR_HEADER(LoadFixedSlotT) LLoadFixedSlotT(const LAllocation &object) { setOperand(0, object); @@ -2533,7 +2533,7 @@ class LLoadFixedSlotT : public LInstructionHelper<1, 1, 0> class LStoreFixedSlotV : public LInstructionHelper<0, 1 + BOX_PIECES, 0> { public: - LIR_HEADER(StoreFixedSlotV); + LIR_HEADER(StoreFixedSlotV) LStoreFixedSlotV(const LAllocation &obj) { setOperand(0, obj); @@ -2553,7 +2553,7 @@ class LStoreFixedSlotV : public LInstructionHelper<0, 1 + BOX_PIECES, 0> class LStoreFixedSlotT : public LInstructionHelper<0, 2, 0> { public: - LIR_HEADER(StoreFixedSlotT); + LIR_HEADER(StoreFixedSlotT) LStoreFixedSlotT(const LAllocation &obj, const LAllocation &value) { @@ -2575,8 +2575,8 @@ class LStoreFixedSlotT : public LInstructionHelper<0, 2, 0> class LGetNameCache : public LInstructionHelper { public: - LIR_HEADER(GetNameCache); - BOX_OUTPUT_ACCESSORS(); + LIR_HEADER(GetNameCache) + BOX_OUTPUT_ACCESSORS() LGetNameCache(const LAllocation &scopeObj) { setOperand(0, scopeObj); @@ -2592,8 +2592,8 @@ class LGetNameCache : public LInstructionHelper class LCallGetIntrinsicValue : public LCallInstructionHelper { public: - LIR_HEADER(CallGetIntrinsicValue); - BOX_OUTPUT_ACCESSORS(); + LIR_HEADER(CallGetIntrinsicValue) + BOX_OUTPUT_ACCESSORS() const MCallGetIntrinsicValue *mir() const { return mir_->toCallGetIntrinsicValue(); @@ -2605,8 +2605,8 @@ class LCallGetIntrinsicValue : public LCallInstructionHelper class LGetPropertyCacheV : public LInstructionHelper { public: - LIR_HEADER(GetPropertyCacheV); - BOX_OUTPUT_ACCESSORS(); + LIR_HEADER(GetPropertyCacheV) + BOX_OUTPUT_ACCESSORS() LGetPropertyCacheV(const LAllocation &object) { setOperand(0, object); @@ -2621,7 +2621,7 @@ class LGetPropertyCacheV : public LInstructionHelper class LGetPropertyCacheT : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(GetPropertyCacheT); + LIR_HEADER(GetPropertyCacheT) LGetPropertyCacheT(const LAllocation &object) { setOperand(0, object); @@ -2634,8 +2634,8 @@ class LGetPropertyCacheT : public LInstructionHelper<1, 1, 0> class LGetElementCacheV : public LInstructionHelper { public: - LIR_HEADER(GetElementCacheV); - BOX_OUTPUT_ACCESSORS(); + LIR_HEADER(GetElementCacheV) + BOX_OUTPUT_ACCESSORS() static const size_t Index = 1; @@ -2653,7 +2653,7 @@ class LGetElementCacheV : public LInstructionHelper { public: - LIR_HEADER(BindNameCache); + LIR_HEADER(BindNameCache) LBindNameCache(const LAllocation &scopeChain) { setOperand(0, scopeChain); @@ -2670,8 +2670,8 @@ class LBindNameCache : public LInstructionHelper<1, 1, 0> class LLoadSlotV : public LInstructionHelper { public: - LIR_HEADER(LoadSlotV); - BOX_OUTPUT_ACCESSORS(); + LIR_HEADER(LoadSlotV) + BOX_OUTPUT_ACCESSORS() LLoadSlotV(const LAllocation &in) { setOperand(0, in); @@ -2687,7 +2687,7 @@ class LLoadSlotV : public LInstructionHelper class LLoadSlotT : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(LoadSlotT); + LIR_HEADER(LoadSlotT) LLoadSlotT(const LAllocation &in) { setOperand(0, in); @@ -2701,7 +2701,7 @@ class LLoadSlotT : public LInstructionHelper<1, 1, 0> class LStoreSlotV : public LInstructionHelper<0, 1 + BOX_PIECES, 0> { public: - LIR_HEADER(StoreSlotV); + LIR_HEADER(StoreSlotV) LStoreSlotV(const LAllocation &slots) { setOperand(0, slots); @@ -2726,7 +2726,7 @@ class LStoreSlotV : public LInstructionHelper<0, 1 + BOX_PIECES, 0> class LStoreSlotT : public LInstructionHelper<0, 2, 0> { public: - LIR_HEADER(StoreSlotT); + LIR_HEADER(StoreSlotT) LStoreSlotT(const LAllocation &slots, const LAllocation &value) { setOperand(0, slots); @@ -2747,7 +2747,7 @@ class LStoreSlotT : public LInstructionHelper<0, 2, 0> class LStringLength : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(StringLength); + LIR_HEADER(StringLength) LStringLength(const LAllocation &string) { setOperand(0, string); @@ -2762,7 +2762,7 @@ class LStringLength : public LInstructionHelper<1, 1, 0> class LFloor : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(Floor); + LIR_HEADER(Floor) LFloor(const LAllocation &num) { setOperand(0, num); @@ -2777,7 +2777,7 @@ class LFloor : public LInstructionHelper<1, 1, 0> class LRound : public LInstructionHelper<1, 1, 1> { public: - LIR_HEADER(Round); + LIR_HEADER(Round) LRound(const LAllocation &num, const LDefinition &temp) { setOperand(0, num); @@ -2796,7 +2796,7 @@ class LRound : public LInstructionHelper<1, 1, 1> class LFunctionEnvironment : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(FunctionEnvironment); + LIR_HEADER(FunctionEnvironment) LFunctionEnvironment(const LAllocation &function) { setOperand(0, function); @@ -2809,7 +2809,7 @@ class LFunctionEnvironment : public LInstructionHelper<1, 1, 0> class LCallGetProperty : public LCallInstructionHelper { public: - LIR_HEADER(CallGetProperty); + LIR_HEADER(CallGetProperty) static const size_t Value = 0; @@ -2822,8 +2822,8 @@ class LCallGetProperty : public LCallInstructionHelper { public: - LIR_HEADER(CallGetElement); - BOX_OUTPUT_ACCESSORS(); + LIR_HEADER(CallGetElement) + BOX_OUTPUT_ACCESSORS() static const size_t LhsInput = 0; static const size_t RhsInput = BOX_PIECES; @@ -2837,8 +2837,8 @@ class LCallGetElement : public LCallInstructionHelper { public: - LIR_HEADER(CallSetElement); - BOX_OUTPUT_ACCESSORS(); + LIR_HEADER(CallSetElement) + BOX_OUTPUT_ACCESSORS() static const size_t Index = 1; static const size_t Value = 1 + BOX_PIECES; @@ -2848,7 +2848,7 @@ class LCallSetElement : public LCallInstructionHelper<0, 1 + 2 * BOX_PIECES, 0> class LCallSetProperty : public LCallInstructionHelper<0, 1 + BOX_PIECES, 0> { public: - LIR_HEADER(CallSetProperty); + LIR_HEADER(CallSetProperty) LCallSetProperty(const LAllocation &obj) { setOperand(0, obj); @@ -2864,7 +2864,7 @@ class LCallSetProperty : public LCallInstructionHelper<0, 1 + BOX_PIECES, 0> class LCallDeleteProperty : public LCallInstructionHelper<1, BOX_PIECES, 0> { public: - LIR_HEADER(CallDeleteProperty); + LIR_HEADER(CallDeleteProperty) static const size_t Value = 0; @@ -2878,7 +2878,7 @@ class LCallDeleteProperty : public LCallInstructionHelper<1, BOX_PIECES, 0> class LSetPropertyCacheV : public LInstructionHelper<0, 1 + BOX_PIECES, 1> { public: - LIR_HEADER(SetPropertyCacheV); + LIR_HEADER(SetPropertyCacheV) LSetPropertyCacheV(const LAllocation &object, const LDefinition &slots) { setOperand(0, object); @@ -2899,7 +2899,7 @@ class LSetPropertyCacheT : public LInstructionHelper<0, 2, 1> MIRType valueType_; public: - LIR_HEADER(SetPropertyCacheT); + LIR_HEADER(SetPropertyCacheT) LSetPropertyCacheT(const LAllocation &object, const LDefinition &slots, const LAllocation &value, MIRType valueType) @@ -2921,7 +2921,7 @@ class LSetPropertyCacheT : public LInstructionHelper<0, 2, 1> class LCallIteratorStart : public LCallInstructionHelper<1, 1, 0> { public: - LIR_HEADER(CallIteratorStart); + LIR_HEADER(CallIteratorStart) LCallIteratorStart(const LAllocation &object) { setOperand(0, object); @@ -2937,7 +2937,7 @@ class LCallIteratorStart : public LCallInstructionHelper<1, 1, 0> class LIteratorStart : public LInstructionHelper<1, 1, 3> { public: - LIR_HEADER(IteratorStart); + LIR_HEADER(IteratorStart) LIteratorStart(const LAllocation &object, const LDefinition &temp1, const LDefinition &temp2, const LDefinition &temp3) { @@ -2966,8 +2966,8 @@ class LIteratorStart : public LInstructionHelper<1, 1, 3> class LIteratorNext : public LInstructionHelper { public: - LIR_HEADER(IteratorNext); - BOX_OUTPUT_ACCESSORS(); + LIR_HEADER(IteratorNext) + BOX_OUTPUT_ACCESSORS() LIteratorNext(const LAllocation &iterator, const LDefinition &temp) { setOperand(0, iterator); @@ -2987,7 +2987,7 @@ class LIteratorNext : public LInstructionHelper class LIteratorMore : public LInstructionHelper<1, 1, 1> { public: - LIR_HEADER(IteratorMore); + LIR_HEADER(IteratorMore) LIteratorMore(const LAllocation &iterator, const LDefinition &temp) { setOperand(0, iterator); @@ -3007,7 +3007,7 @@ class LIteratorMore : public LInstructionHelper<1, 1, 1> class LIteratorEnd : public LInstructionHelper<0, 1, 2> { public: - LIR_HEADER(IteratorEnd); + LIR_HEADER(IteratorEnd) LIteratorEnd(const LAllocation &iterator, const LDefinition &temp1, const LDefinition &temp2) { @@ -3033,15 +3033,15 @@ class LIteratorEnd : public LInstructionHelper<0, 1, 2> class LArgumentsLength : public LInstructionHelper<1, 0, 0> { public: - LIR_HEADER(ArgumentsLength); + LIR_HEADER(ArgumentsLength) }; // Load a value from the actual arguments. class LGetArgument : public LInstructionHelper { public: - LIR_HEADER(GetArgument); - BOX_OUTPUT_ACCESSORS(); + LIR_HEADER(GetArgument) + BOX_OUTPUT_ACCESSORS() LGetArgument(const LAllocation &index) { setOperand(0, index); @@ -3055,8 +3055,8 @@ class LGetArgument : public LInstructionHelper class LTypeBarrier : public LInstructionHelper { public: - LIR_HEADER(TypeBarrier); - BOX_OUTPUT_ACCESSORS(); + LIR_HEADER(TypeBarrier) + BOX_OUTPUT_ACCESSORS() LTypeBarrier(const LDefinition &temp) { setTemp(0, temp); @@ -3076,7 +3076,7 @@ class LTypeBarrier : public LInstructionHelper class LMonitorTypes : public LInstructionHelper<0, BOX_PIECES, 1> { public: - LIR_HEADER(MonitorTypes); + LIR_HEADER(MonitorTypes) LMonitorTypes(const LDefinition &temp) { setTemp(0, temp); @@ -3096,7 +3096,7 @@ class LMonitorTypes : public LInstructionHelper<0, BOX_PIECES, 1> class LGuardClass : public LInstructionHelper<0, 1, 1> { public: - LIR_HEADER(GuardClass); + LIR_HEADER(GuardClass) LGuardClass(const LAllocation &in, const LDefinition &temp) { setOperand(0, in); @@ -3127,7 +3127,7 @@ class LPhi : public LInstruction LPhi(MPhi *mir); public: - LIR_HEADER(Phi); + LIR_HEADER(Phi) static LPhi *New(MIRGenerator *gen, MPhi *phi); @@ -3172,7 +3172,7 @@ class LPhi : public LInstruction class LIn : public LCallInstructionHelper<1, BOX_PIECES+1, 0> { public: - LIR_HEADER(In); + LIR_HEADER(In) LIn(const LAllocation &rhs) { setOperand(RHS, rhs); } @@ -3191,7 +3191,7 @@ class LIn : public LCallInstructionHelper<1, BOX_PIECES+1, 0> class LInstanceOfO : public LInstructionHelper<1, 1, 0> { public: - LIR_HEADER(InstanceOfO); + LIR_HEADER(InstanceOfO) LInstanceOfO(const LAllocation &lhs) { setOperand(0, lhs); } @@ -3208,7 +3208,7 @@ class LInstanceOfO : public LInstructionHelper<1, 1, 0> class LInstanceOfV : public LInstructionHelper<1, BOX_PIECES, 0> { public: - LIR_HEADER(InstanceOfV); + LIR_HEADER(InstanceOfV) LInstanceOfV() { } @@ -3226,7 +3226,7 @@ class LInstanceOfV : public LInstructionHelper<1, BOX_PIECES, 0> class LCallInstanceOf : public LCallInstructionHelper<1, BOX_PIECES+1, 0> { public: - LIR_HEADER(CallInstanceOf); + LIR_HEADER(CallInstanceOf) LCallInstanceOf(const LAllocation &rhs) { setOperand(RHS, rhs); } @@ -3248,7 +3248,7 @@ class LCallInstanceOf : public LCallInstructionHelper<1, BOX_PIECES+1, 0> class LFunctionBoundary : public LInstructionHelper<0, 0, 1> { public: - LIR_HEADER(FunctionBoundary); + LIR_HEADER(FunctionBoundary) LFunctionBoundary(const LDefinition &temp) { setTemp(0, temp); diff --git a/js/src/ion/LIR.h b/js/src/ion/LIR.h index c0b32131dcca..5a49ac58249b 100644 --- a/js/src/ion/LIR.h +++ b/js/src/ion/LIR.h @@ -624,7 +624,7 @@ class LInstruction virtual bool isCall() const { return false; - }; + } uint32_t id() const { return id_; } diff --git a/js/src/ion/LinearScan.h b/js/src/ion/LinearScan.h index f3d89a8c1816..44f9ffddd4cf 100644 --- a/js/src/ion/LinearScan.h +++ b/js/src/ion/LinearScan.h @@ -125,8 +125,8 @@ class LinearScanAllocator : public LiveRangeAllocator void validateIntervals(); void validateAllocations(); #else - inline void validateIntervals() { }; - inline void validateAllocations() { }; + inline void validateIntervals() { } + inline void validateAllocations() { } #endif #ifdef JS_NUNBOX32 diff --git a/js/src/ion/MIR.h b/js/src/ion/MIR.h index 2c21b55ab98f..8676a30018cb 100644 --- a/js/src/ion/MIR.h +++ b/js/src/ion/MIR.h @@ -571,7 +571,7 @@ class MStart : public MNullaryInstruction { } public: - INSTRUCTION_HEADER(Start); + INSTRUCTION_HEADER(Start) static MStart *New(StartType startType) { return new MStart(startType); } @@ -592,7 +592,7 @@ class MOsrEntry : public MNullaryInstruction } public: - INSTRUCTION_HEADER(OsrEntry); + INSTRUCTION_HEADER(OsrEntry) static MOsrEntry *New() { return new MOsrEntry; } @@ -607,7 +607,7 @@ class MNop : public MNullaryInstruction } public: - INSTRUCTION_HEADER(Nop); + INSTRUCTION_HEADER(Nop) static MNop *New() { return new MNop(); } @@ -626,7 +626,7 @@ class MConstant : public MNullaryInstruction MConstant(const Value &v); public: - INSTRUCTION_HEADER(Constant); + INSTRUCTION_HEADER(Constant) static MConstant *New(const Value &v); const js::Value &value() const { @@ -664,7 +664,7 @@ class MParameter : public MNullaryInstruction } public: - INSTRUCTION_HEADER(Parameter); + INSTRUCTION_HEADER(Parameter) static MParameter *New(int32_t index, const types::TypeSet *types); int32_t index() const { @@ -688,7 +688,7 @@ class MCallee : public MNullaryInstruction } public: - INSTRUCTION_HEADER(Callee); + INSTRUCTION_HEADER(Callee) bool congruentTo(MDefinition * const &ins) const { return congruentIfOperandsEqual(ins); @@ -748,7 +748,7 @@ class MTableSwitch } public: - INSTRUCTION_HEADER(TableSwitch); + INSTRUCTION_HEADER(TableSwitch) static MTableSwitch *New(MDefinition *ins, int32_t low, int32_t high); @@ -864,7 +864,7 @@ class MGoto : public MAryControlInstruction<0, 1> } public: - INSTRUCTION_HEADER(Goto); + INSTRUCTION_HEADER(Goto) static MGoto *New(MBasicBlock *target); MBasicBlock *target() { @@ -899,7 +899,7 @@ class MTest } public: - INSTRUCTION_HEADER(Test); + INSTRUCTION_HEADER(Test) static MTest *New(MDefinition *ins, MBasicBlock *ifTrue, MBasicBlock *ifFalse); @@ -932,7 +932,7 @@ class MReturn } public: - INSTRUCTION_HEADER(Return); + INSTRUCTION_HEADER(Return) static MReturn *New(MDefinition *ins) { return new MReturn(ins); } @@ -954,7 +954,7 @@ class MThrow } public: - INSTRUCTION_HEADER(Throw); + INSTRUCTION_HEADER(Throw) static MThrow *New(MDefinition *ins) { return new MThrow(ins); } @@ -984,7 +984,7 @@ class MNewArray : public MNullaryInstruction AllocatingBehaviour allocating_; public: - INSTRUCTION_HEADER(NewArray); + INSTRUCTION_HEADER(NewArray) MNewArray(uint32_t count, JSObject *templateObject, AllocatingBehaviour allocating) : count_(count), @@ -1028,7 +1028,7 @@ class MNewObject : public MNullaryInstruction } public: - INSTRUCTION_HEADER(NewObject); + INSTRUCTION_HEADER(NewObject) static MNewObject *New(JSObject *templateObject) { return new MNewObject(templateObject); @@ -1057,7 +1057,7 @@ class MInitProp } public: - INSTRUCTION_HEADER(InitProp); + INSTRUCTION_HEADER(InitProp) static MInitProp *New(MDefinition *obj, HandlePropertyName name, MDefinition *value) { return new MInitProp(obj, name, value); @@ -1084,7 +1084,7 @@ class MInitProp class MPrepareCall : public MNullaryInstruction { public: - INSTRUCTION_HEADER(PrepareCall); + INSTRUCTION_HEADER(PrepareCall) MPrepareCall() { } @@ -1147,7 +1147,7 @@ class MCall } public: - INSTRUCTION_HEADER(Call); + INSTRUCTION_HEADER(Call) static MCall *New(JSFunction *target, size_t maxArgc, size_t numActualArgs, bool construct); void initPrepareCall(MDefinition *start) { @@ -1221,7 +1221,7 @@ class MApplyArgs } public: - INSTRUCTION_HEADER(ApplyArgs); + INSTRUCTION_HEADER(ApplyArgs) static MApplyArgs *New(JSFunction *target, MDefinition *fun, MDefinition *argc, MDefinition *self); @@ -1379,7 +1379,7 @@ class MCompare } public: - INSTRUCTION_HEADER(Compare); + INSTRUCTION_HEADER(Compare) static MCompare *New(MDefinition *left, MDefinition *right, JSOp op); bool tryFold(bool *result); @@ -1426,7 +1426,7 @@ class MBox : public MUnaryInstruction } public: - INSTRUCTION_HEADER(Box); + INSTRUCTION_HEADER(Box) static MBox *New(MDefinition *ins) { // Cannot box a box. @@ -1479,7 +1479,7 @@ class MUnbox : public MUnaryInstruction } public: - INSTRUCTION_HEADER(Unbox); + INSTRUCTION_HEADER(Unbox) static MUnbox *New(MDefinition *ins, MIRType type, Mode mode) { return new MUnbox(ins, type, mode); @@ -1520,7 +1520,7 @@ class MGuardObject : public MUnaryInstruction, public SingleObjectPolicy } public: - INSTRUCTION_HEADER(GuardObject); + INSTRUCTION_HEADER(GuardObject) static MGuardObject *New(MDefinition *ins) { return new MGuardObject(ins); @@ -1551,7 +1551,7 @@ class MGuardString } public: - INSTRUCTION_HEADER(GuardString); + INSTRUCTION_HEADER(GuardString) static MGuardString *New(MDefinition *ins) { return new MGuardString(ins); @@ -1588,7 +1588,7 @@ class MCreateThis } public: - INSTRUCTION_HEADER(CreateThis); + INSTRUCTION_HEADER(CreateThis) static MCreateThis *New(MDefinition *callee, MDefinition *prototype, JSObject *templateObject) { return new MCreateThis(callee, prototype, templateObject); @@ -1632,7 +1632,7 @@ class MReturnFromCtor } public: - INSTRUCTION_HEADER(ReturnFromCtor); + INSTRUCTION_HEADER(ReturnFromCtor) static MReturnFromCtor *New(MDefinition *value, MDefinition *object) { return new MReturnFromCtor(value, object); @@ -1670,7 +1670,7 @@ class MPassArg : public MUnaryInstruction } public: - INSTRUCTION_HEADER(PassArg); + INSTRUCTION_HEADER(PassArg) static MPassArg *New(MDefinition *def) { return new MPassArg(def); @@ -1707,7 +1707,7 @@ class MToDouble } public: - INSTRUCTION_HEADER(ToDouble); + INSTRUCTION_HEADER(ToDouble) static MToDouble *New(MDefinition *def) { return new MToDouble(def); @@ -1741,7 +1741,7 @@ class MToInt32 : public MUnaryInstruction } public: - INSTRUCTION_HEADER(ToInt32); + INSTRUCTION_HEADER(ToInt32) static MToInt32 *New(MDefinition *def) { return new MToInt32(def); @@ -1784,7 +1784,7 @@ class MTruncateToInt32 : public MUnaryInstruction } public: - INSTRUCTION_HEADER(TruncateToInt32); + INSTRUCTION_HEADER(TruncateToInt32) static MTruncateToInt32 *New(MDefinition *def) { return new MTruncateToInt32(def); @@ -1815,7 +1815,7 @@ class MToString : public MUnaryInstruction } public: - INSTRUCTION_HEADER(ToString); + INSTRUCTION_HEADER(ToString) static MToString *New(MDefinition *def) { return new MToString(def); @@ -1849,7 +1849,7 @@ class MBitNot } public: - INSTRUCTION_HEADER(BitNot); + INSTRUCTION_HEADER(BitNot) static MBitNot *New(MDefinition *input); TypePolicy *typePolicy() { @@ -1883,7 +1883,7 @@ class MTypeOf } public: - INSTRUCTION_HEADER(TypeOf); + INSTRUCTION_HEADER(TypeOf) static MTypeOf *New(MDefinition *def, MIRType inputType) { return new MTypeOf(def, inputType); @@ -1920,7 +1920,7 @@ class MToId } public: - INSTRUCTION_HEADER(ToId); + INSTRUCTION_HEADER(ToId) static MToId *New(MDefinition *object, MDefinition *index) { return new MToId(object, index); @@ -1971,7 +1971,7 @@ class MBitAnd : public MBinaryBitwiseInstruction { } public: - INSTRUCTION_HEADER(BitAnd); + INSTRUCTION_HEADER(BitAnd) static MBitAnd *New(MDefinition *left, MDefinition *right); MDefinition *foldIfZero(size_t operand) { @@ -1993,7 +1993,7 @@ class MBitOr : public MBinaryBitwiseInstruction { } public: - INSTRUCTION_HEADER(BitOr); + INSTRUCTION_HEADER(BitOr) static MBitOr *New(MDefinition *left, MDefinition *right); MDefinition *foldIfZero(size_t operand) { @@ -2014,7 +2014,7 @@ class MBitXor : public MBinaryBitwiseInstruction { } public: - INSTRUCTION_HEADER(BitXor); + INSTRUCTION_HEADER(BitXor) static MBitXor *New(MDefinition *left, MDefinition *right); MDefinition *foldIfZero(size_t operand) { @@ -2053,7 +2053,7 @@ class MLsh : public MShiftInstruction { } public: - INSTRUCTION_HEADER(Lsh); + INSTRUCTION_HEADER(Lsh) static MLsh *New(MDefinition *left, MDefinition *right); MDefinition *foldIfZero(size_t operand) { @@ -2072,7 +2072,7 @@ class MRsh : public MShiftInstruction { } public: - INSTRUCTION_HEADER(Rsh); + INSTRUCTION_HEADER(Rsh) static MRsh *New(MDefinition *left, MDefinition *right); MDefinition *foldIfZero(size_t operand) { @@ -2093,7 +2093,7 @@ class MUrsh : public MShiftInstruction { } public: - INSTRUCTION_HEADER(Ursh); + INSTRUCTION_HEADER(Ursh) static MUrsh *New(MDefinition *left, MDefinition *right); MDefinition *foldIfZero(size_t operand) { @@ -2187,7 +2187,7 @@ class MMinMax } public: - INSTRUCTION_HEADER(MinMax); + INSTRUCTION_HEADER(MinMax) static MMinMax *New(MDefinition *left, MDefinition *right, MIRType type, bool isMax) { return new MMinMax(left, right, type, isMax); } @@ -2229,7 +2229,7 @@ class MAbs } public: - INSTRUCTION_HEADER(Abs); + INSTRUCTION_HEADER(Abs) static MAbs *New(MDefinition *num, MIRType type) { return new MAbs(num, type); } @@ -2262,7 +2262,7 @@ class MSqrt } public: - INSTRUCTION_HEADER(Sqrt); + INSTRUCTION_HEADER(Sqrt) static MSqrt *New(MDefinition *num) { return new MSqrt(num); } @@ -2295,7 +2295,7 @@ class MPow } public: - INSTRUCTION_HEADER(Pow); + INSTRUCTION_HEADER(Pow) static MPow *New(MDefinition *input, MDefinition *power, MIRType powerType) { return new MPow(input, power, powerType); } @@ -2330,7 +2330,7 @@ class MPowHalf } public: - INSTRUCTION_HEADER(PowHalf); + INSTRUCTION_HEADER(PowHalf) static MPowHalf *New(MDefinition *input) { return new MPowHalf(input); } @@ -2357,11 +2357,11 @@ class MRandom : public MNullaryInstruction } public: - INSTRUCTION_HEADER(Random); + INSTRUCTION_HEADER(Random) static MRandom *New() { return new MRandom; } - + AliasSet getAliasSet() const { return AliasSet::None(); } @@ -2391,7 +2391,7 @@ class MMathFunction } public: - INSTRUCTION_HEADER(MathFunction); + INSTRUCTION_HEADER(MathFunction) static MMathFunction *New(MDefinition *input, Function function, MathCache *cache) { return new MMathFunction(input, function, cache); } @@ -2432,7 +2432,7 @@ class MAdd : public MBinaryArithInstruction } public: - INSTRUCTION_HEADER(Add); + INSTRUCTION_HEADER(Add) static MAdd *New(MDefinition *left, MDefinition *right) { return new MAdd(left, right); } @@ -2464,7 +2464,7 @@ class MSub : public MBinaryArithInstruction } public: - INSTRUCTION_HEADER(Sub); + INSTRUCTION_HEADER(Sub) static MSub *New(MDefinition *left, MDefinition *right) { return new MSub(left, right); } @@ -2513,7 +2513,7 @@ class MMul : public MBinaryArithInstruction } public: - INSTRUCTION_HEADER(Mul); + INSTRUCTION_HEADER(Mul) static MMul *New(MDefinition *left, MDefinition *right) { return new MMul(left, right, MIRType_Value); } @@ -2584,7 +2584,7 @@ class MDiv : public MBinaryArithInstruction public: - INSTRUCTION_HEADER(Div); + INSTRUCTION_HEADER(Div) static MDiv *New(MDefinition *left, MDefinition *right) { return new MDiv(left, right, MIRType_Value); } @@ -2636,7 +2636,7 @@ class MMod : public MBinaryArithInstruction } public: - INSTRUCTION_HEADER(Mod); + INSTRUCTION_HEADER(Mod) static MMod *New(MDefinition *left, MDefinition *right) { return new MMod(left, right); } @@ -2662,7 +2662,7 @@ class MConcat } public: - INSTRUCTION_HEADER(Concat); + INSTRUCTION_HEADER(Concat) static MConcat *New(MDefinition *left, MDefinition *right) { return new MConcat(left, right); } @@ -2690,7 +2690,7 @@ class MCharCodeAt } public: - INSTRUCTION_HEADER(CharCodeAt); + INSTRUCTION_HEADER(CharCodeAt) static MCharCodeAt *New(MDefinition *str, MDefinition *index) { return new MCharCodeAt(str, index); @@ -2720,7 +2720,7 @@ class MFromCharCode } public: - INSTRUCTION_HEADER(FromCharCode); + INSTRUCTION_HEADER(FromCharCode) static MFromCharCode *New(MDefinition *code) { return new MFromCharCode(code); @@ -2753,7 +2753,7 @@ class MPhi : public MDefinition, public InlineForwardListNode } public: - INSTRUCTION_HEADER(Phi); + INSTRUCTION_HEADER(Phi) static MPhi *New(uint32_t slot); MDefinition *getOperand(size_t index) const { @@ -2813,7 +2813,7 @@ class MBeta : public MUnaryInstruction } public: - INSTRUCTION_HEADER(Beta); + INSTRUCTION_HEADER(Beta) void printOpcode(FILE *fp); static MBeta *New(MDefinition *val, const Range *comp) { @@ -2842,7 +2842,7 @@ class MOsrValue : public MUnaryInstruction } public: - INSTRUCTION_HEADER(OsrValue); + INSTRUCTION_HEADER(OsrValue) static MOsrValue *New(MOsrEntry *entry, ptrdiff_t frameOffset) { return new MOsrValue(entry, frameOffset); } @@ -2872,7 +2872,7 @@ class MOsrScopeChain : public MUnaryInstruction } public: - INSTRUCTION_HEADER(OsrScopeChain); + INSTRUCTION_HEADER(OsrScopeChain) static MOsrScopeChain *New(MOsrEntry *entry) { return new MOsrScopeChain(entry); } @@ -2886,7 +2886,7 @@ class MOsrScopeChain : public MUnaryInstruction class MCheckOverRecursed : public MNullaryInstruction { public: - INSTRUCTION_HEADER(CheckOverRecursed); + INSTRUCTION_HEADER(CheckOverRecursed) }; // Check the script's use count and trigger recompilation to inline @@ -2902,7 +2902,7 @@ class MRecompileCheck : public MNullaryInstruction } public: - INSTRUCTION_HEADER(RecompileCheck); + INSTRUCTION_HEADER(RecompileCheck) uint32_t minUses() const { return minUses_; @@ -2923,7 +2923,7 @@ class MInterruptCheck : public MNullaryInstruction } public: - INSTRUCTION_HEADER(InterruptCheck); + INSTRUCTION_HEADER(InterruptCheck) static MInterruptCheck *New() { return new MInterruptCheck(); @@ -2948,7 +2948,7 @@ class MDefVar : public MUnaryInstruction } public: - INSTRUCTION_HEADER(DefVar); + INSTRUCTION_HEADER(DefVar) static MDefVar *New(PropertyName *name, unsigned attrs, MDefinition *scopeChain) { return new MDefVar(name, attrs, scopeChain); @@ -3061,7 +3061,7 @@ class MLambda } public: - INSTRUCTION_HEADER(Lambda); + INSTRUCTION_HEADER(Lambda) static MLambda *New(MDefinition *scopeChain, JSFunction *fun) { return new MLambda(scopeChain, fun); @@ -3090,7 +3090,7 @@ class MImplicitThis } public: - INSTRUCTION_HEADER(ImplicitThis); + INSTRUCTION_HEADER(ImplicitThis) static MImplicitThis *New(MDefinition *callee) { return new MImplicitThis(callee); @@ -3120,7 +3120,7 @@ class MSlots } public: - INSTRUCTION_HEADER(Slots); + INSTRUCTION_HEADER(Slots) static MSlots *New(MDefinition *object) { return new MSlots(object); @@ -3153,7 +3153,7 @@ class MElements } public: - INSTRUCTION_HEADER(Elements); + INSTRUCTION_HEADER(Elements) static MElements *New(MDefinition *object) { return new MElements(object); @@ -3187,7 +3187,7 @@ class MConstantElements : public MNullaryInstruction } public: - INSTRUCTION_HEADER(ConstantElements); + INSTRUCTION_HEADER(ConstantElements) static MConstantElements *New(void *v) { return new MConstantElements(v); } @@ -3223,7 +3223,7 @@ class MInitializedLength } public: - INSTRUCTION_HEADER(InitializedLength); + INSTRUCTION_HEADER(InitializedLength) static MInitializedLength *New(MDefinition *elements) { return new MInitializedLength(elements); @@ -3251,7 +3251,7 @@ class MSetInitializedLength } public: - INSTRUCTION_HEADER(SetInitializedLength); + INSTRUCTION_HEADER(SetInitializedLength) static MSetInitializedLength *New(MDefinition *elements, MDefinition *index) { return new MSetInitializedLength(elements, index); @@ -3280,7 +3280,7 @@ class MArrayLength setMovable(); } - INSTRUCTION_HEADER(ArrayLength); + INSTRUCTION_HEADER(ArrayLength) MDefinition *elements() const { return getOperand(0); @@ -3306,7 +3306,7 @@ class MTypedArrayLength } public: - INSTRUCTION_HEADER(TypedArrayLength); + INSTRUCTION_HEADER(TypedArrayLength) static MTypedArrayLength *New(MDefinition *obj) { return new MTypedArrayLength(obj); @@ -3341,7 +3341,7 @@ class MTypedArrayElements } public: - INSTRUCTION_HEADER(TypedArrayElements); + INSTRUCTION_HEADER(TypedArrayElements) static MTypedArrayElements *New(MDefinition *object) { return new MTypedArrayElements(object); @@ -3374,7 +3374,7 @@ class MNot setMovable(); } - INSTRUCTION_HEADER(Not); + INSTRUCTION_HEADER(Not) MDefinition *foldsTo(bool useValueNumbers); @@ -3413,7 +3413,7 @@ class MBoundsCheck } public: - INSTRUCTION_HEADER(BoundsCheck); + INSTRUCTION_HEADER(BoundsCheck) static MBoundsCheck *New(MDefinition *index, MDefinition *length) { return new MBoundsCheck(index, length); @@ -3464,7 +3464,7 @@ class MBoundsCheckLower } public: - INSTRUCTION_HEADER(BoundsCheckLower); + INSTRUCTION_HEADER(BoundsCheckLower) static MBoundsCheckLower *New(MDefinition *index) { return new MBoundsCheckLower(index); @@ -3504,7 +3504,7 @@ class MLoadElement } public: - INSTRUCTION_HEADER(LoadElement); + INSTRUCTION_HEADER(LoadElement) static MLoadElement *New(MDefinition *elements, MDefinition *index, bool needsHoleCheck) { return new MLoadElement(elements, index, needsHoleCheck); @@ -3551,7 +3551,7 @@ class MLoadElementHole } public: - INSTRUCTION_HEADER(LoadElementHole); + INSTRUCTION_HEADER(LoadElementHole) static MLoadElementHole *New(MDefinition *elements, MDefinition *index, MDefinition *initLength, bool needsHoleCheck) { @@ -3620,7 +3620,7 @@ class MStoreElement } public: - INSTRUCTION_HEADER(StoreElement); + INSTRUCTION_HEADER(StoreElement) static MStoreElement *New(MDefinition *elements, MDefinition *index, MDefinition *value) { return new MStoreElement(elements, index, value); @@ -3662,7 +3662,7 @@ class MStoreElementHole } public: - INSTRUCTION_HEADER(StoreElementHole); + INSTRUCTION_HEADER(StoreElementHole) static MStoreElementHole *New(MDefinition *object, MDefinition *elements, MDefinition *index, MDefinition *value) { @@ -3713,7 +3713,7 @@ class MArrayPopShift { } public: - INSTRUCTION_HEADER(ArrayPopShift); + INSTRUCTION_HEADER(ArrayPopShift) static MArrayPopShift *New(MDefinition *object, Mode mode, bool needsHoleCheck, bool maybeUndefined) { @@ -3752,7 +3752,7 @@ class MArrayPush } public: - INSTRUCTION_HEADER(ArrayPush); + INSTRUCTION_HEADER(ArrayPush) static MArrayPush *New(MDefinition *object, MDefinition *value) { return new MArrayPush(object, value); @@ -3787,7 +3787,7 @@ class MArrayConcat } public: - INSTRUCTION_HEADER(ArrayConcat); + INSTRUCTION_HEADER(ArrayConcat) static MArrayConcat *New(MDefinition *lhs, MDefinition *rhs, HandleObject templateObj) { return new MArrayConcat(lhs, rhs, templateObj); @@ -3820,7 +3820,7 @@ class MLoadTypedArrayElement } public: - INSTRUCTION_HEADER(LoadTypedArrayElement); + INSTRUCTION_HEADER(LoadTypedArrayElement) static MLoadTypedArrayElement *New(MDefinition *elements, MDefinition *index, int arrayType) { return new MLoadTypedArrayElement(elements, index, arrayType); @@ -3863,7 +3863,7 @@ class MLoadTypedArrayElementHole } public: - INSTRUCTION_HEADER(LoadTypedArrayElementHole); + INSTRUCTION_HEADER(LoadTypedArrayElementHole) static MLoadTypedArrayElementHole *New(MDefinition *object, MDefinition *index, int arrayType, bool allowDouble) { return new MLoadTypedArrayElementHole(object, index, arrayType, allowDouble); @@ -3912,7 +3912,7 @@ class MStoreTypedArrayElement } public: - INSTRUCTION_HEADER(StoreTypedArrayElement); + INSTRUCTION_HEADER(StoreTypedArrayElement) static MStoreTypedArrayElement *New(MDefinition *elements, MDefinition *index, MDefinition *value, int arrayType) { @@ -3961,7 +3961,7 @@ class MClampToUint8 } public: - INSTRUCTION_HEADER(ClampToUint8); + INSTRUCTION_HEADER(ClampToUint8) static MClampToUint8 *New(MDefinition *input) { return new MClampToUint8(input); @@ -3999,7 +3999,7 @@ class MLoadFixedSlot } public: - INSTRUCTION_HEADER(LoadFixedSlot); + INSTRUCTION_HEADER(LoadFixedSlot) static MLoadFixedSlot *New(MDefinition *obj, size_t slot) { return new MLoadFixedSlot(obj, slot); @@ -4042,7 +4042,7 @@ class MStoreFixedSlot {} public: - INSTRUCTION_HEADER(StoreFixedSlot); + INSTRUCTION_HEADER(StoreFixedSlot) static MStoreFixedSlot *New(MDefinition *obj, size_t slot, MDefinition *rval) { return new MStoreFixedSlot(obj, rval, slot, false); @@ -4175,7 +4175,7 @@ class MGetPropertyCache } public: - INSTRUCTION_HEADER(GetPropertyCache); + INSTRUCTION_HEADER(GetPropertyCache) static MGetPropertyCache *New(MDefinition *obj, HandlePropertyName name) { return new MGetPropertyCache(obj, name); @@ -4290,7 +4290,7 @@ class MPolyInlineDispatch : public MControlInstruction, public SingleObjectPolic } public: - INSTRUCTION_HEADER(PolyInlineDispatch); + INSTRUCTION_HEADER(PolyInlineDispatch) virtual MDefinition *getOperand(size_t index) const { JS_ASSERT(index == 0); @@ -4405,7 +4405,7 @@ class MGetElementCache } public: - INSTRUCTION_HEADER(GetElementCache); + INSTRUCTION_HEADER(GetElementCache) static MGetElementCache *New(MDefinition *obj, MDefinition *value, bool monitoredResult) { return new MGetElementCache(obj, value, monitoredResult); @@ -4440,7 +4440,7 @@ class MBindNameCache } public: - INSTRUCTION_HEADER(BindNameCache); + INSTRUCTION_HEADER(BindNameCache) static MBindNameCache *New(MDefinition *scopeChain, PropertyName *name, JSScript *script, jsbytecode *pc) { @@ -4483,7 +4483,7 @@ class MGuardShape } public: - INSTRUCTION_HEADER(GuardShape); + INSTRUCTION_HEADER(GuardShape) static MGuardShape *New(MDefinition *obj, const Shape *shape, BailoutKind bailoutKind) { return new MGuardShape(obj, shape, bailoutKind); @@ -4531,7 +4531,7 @@ class MGuardClass } public: - INSTRUCTION_HEADER(GuardClass); + INSTRUCTION_HEADER(GuardClass) static MGuardClass *New(MDefinition *obj, const Class *clasp) { return new MGuardClass(obj, clasp); @@ -4575,7 +4575,7 @@ class MLoadSlot } public: - INSTRUCTION_HEADER(LoadSlot); + INSTRUCTION_HEADER(LoadSlot) static MLoadSlot *New(MDefinition *slots, uint32_t slot) { return new MLoadSlot(slots, slot); @@ -4615,7 +4615,7 @@ class MFunctionEnvironment setResultType(MIRType_Object); } - INSTRUCTION_HEADER(FunctionEnvironment); + INSTRUCTION_HEADER(FunctionEnvironment) static MFunctionEnvironment *New(MDefinition *function) { return new MFunctionEnvironment(function); @@ -4645,7 +4645,7 @@ class MStoreSlot } public: - INSTRUCTION_HEADER(StoreSlot); + INSTRUCTION_HEADER(StoreSlot) static MStoreSlot *New(MDefinition *slots, uint32_t slot, MDefinition *value) { return new MStoreSlot(slots, slot, value, false); @@ -4707,7 +4707,7 @@ class MGetNameCache } public: - INSTRUCTION_HEADER(GetNameCache); + INSTRUCTION_HEADER(GetNameCache) static MGetNameCache *New(MDefinition *obj, HandlePropertyName name, AccessKind kind) { return new MGetNameCache(obj, name, kind); @@ -4737,7 +4737,7 @@ class MCallGetIntrinsicValue : public MNullaryInstruction } public: - INSTRUCTION_HEADER(CallGetIntrinsicValue); + INSTRUCTION_HEADER(CallGetIntrinsicValue) static MCallGetIntrinsicValue *New(HandlePropertyName name) { return new MCallGetIntrinsicValue(name); @@ -4796,7 +4796,7 @@ class MDeleteProperty } public: - INSTRUCTION_HEADER(DeleteProperty); + INSTRUCTION_HEADER(DeleteProperty) static MDeleteProperty *New(MDefinition *obj, HandlePropertyName name) { return new MDeleteProperty(obj, name); @@ -4824,7 +4824,7 @@ class MCallSetProperty } public: - INSTRUCTION_HEADER(CallSetProperty); + INSTRUCTION_HEADER(CallSetProperty) static MCallSetProperty *New(MDefinition *obj, MDefinition *value, HandlePropertyName name, bool strict) { return new MCallSetProperty(obj, value, name, strict); @@ -4845,7 +4845,7 @@ class MSetPropertyCache } public: - INSTRUCTION_HEADER(SetPropertyCache); + INSTRUCTION_HEADER(SetPropertyCache) static MSetPropertyCache *New(MDefinition *obj, MDefinition *value, HandlePropertyName name, bool strict) { return new MSetPropertyCache(obj, value, name, strict); @@ -4871,7 +4871,7 @@ class MCallGetProperty } public: - INSTRUCTION_HEADER(CallGetProperty); + INSTRUCTION_HEADER(CallGetProperty) static MCallGetProperty *New(MDefinition *value, HandlePropertyName name) { return new MCallGetProperty(value, name); @@ -4912,7 +4912,7 @@ class MCallGetElement } public: - INSTRUCTION_HEADER(CallGetElement); + INSTRUCTION_HEADER(CallGetElement) static MCallGetElement *New(MDefinition *lhs, MDefinition *rhs) { return new MCallGetElement(lhs, rhs); @@ -4933,7 +4933,7 @@ class MCallSetElement } public: - INSTRUCTION_HEADER(CallSetElement); + INSTRUCTION_HEADER(CallSetElement) static MCallSetElement *New(MDefinition *object, MDefinition *index, MDefinition *value) { return new MCallSetElement(object, index, value); @@ -4967,7 +4967,7 @@ class MSetDOMProperty } public: - INSTRUCTION_HEADER(SetDOMProperty); + INSTRUCTION_HEADER(SetDOMProperty) static MSetDOMProperty *New(const JSJitPropertyOp func, MDefinition *obj, MDefinition *val) { @@ -5021,7 +5021,7 @@ class MGetDOMProperty } public: - INSTRUCTION_HEADER(GetDOMProperty); + INSTRUCTION_HEADER(GetDOMProperty) static MGetDOMProperty *New(const JSJitInfo *info, MDefinition *obj, MDefinition *guard) { @@ -5080,7 +5080,7 @@ class MStringLength setMovable(); } public: - INSTRUCTION_HEADER(StringLength); + INSTRUCTION_HEADER(StringLength) static MStringLength *New(MDefinition *string) { return new MStringLength(string); @@ -5118,7 +5118,7 @@ class MFloor setMovable(); } - INSTRUCTION_HEADER(Floor); + INSTRUCTION_HEADER(Floor) MDefinition *num() const { return getOperand(0); @@ -5144,7 +5144,7 @@ class MRound setMovable(); } - INSTRUCTION_HEADER(Round); + INSTRUCTION_HEADER(Round) MDefinition *num() const { return getOperand(0); @@ -5170,7 +5170,7 @@ class MIteratorStart } public: - INSTRUCTION_HEADER(IteratorStart); + INSTRUCTION_HEADER(IteratorStart) static MIteratorStart *New(MDefinition *obj, uint8_t flags) { return new MIteratorStart(obj, flags); @@ -5198,7 +5198,7 @@ class MIteratorNext } public: - INSTRUCTION_HEADER(IteratorNext); + INSTRUCTION_HEADER(IteratorNext) static MIteratorNext *New(MDefinition *iter) { return new MIteratorNext(iter); @@ -5223,7 +5223,7 @@ class MIteratorMore } public: - INSTRUCTION_HEADER(IteratorMore); + INSTRUCTION_HEADER(IteratorMore) static MIteratorMore *New(MDefinition *iter) { return new MIteratorMore(iter); @@ -5246,7 +5246,7 @@ class MIteratorEnd { } public: - INSTRUCTION_HEADER(IteratorEnd); + INSTRUCTION_HEADER(IteratorEnd) static MIteratorEnd *New(MDefinition *iter) { return new MIteratorEnd(iter); @@ -5272,7 +5272,7 @@ class MIn setResultType(MIRType_Boolean); } - INSTRUCTION_HEADER(In); + INSTRUCTION_HEADER(In) TypePolicy *typePolicy() { return this; @@ -5298,7 +5298,7 @@ class MInArray } public: - INSTRUCTION_HEADER(InArray); + INSTRUCTION_HEADER(InArray) static MInArray *New(MDefinition *elements, MDefinition *index, MDefinition *initLength, bool needsHoleCheck) { @@ -5337,7 +5337,7 @@ class MInstanceOf setResultType(MIRType_Boolean); } - INSTRUCTION_HEADER(InstanceOf); + INSTRUCTION_HEADER(InstanceOf) TypePolicy *typePolicy() { return this; @@ -5360,7 +5360,7 @@ class MCallInstanceOf setResultType(MIRType_Boolean); } - INSTRUCTION_HEADER(CallInstanceOf); + INSTRUCTION_HEADER(CallInstanceOf) TypePolicy *typePolicy() { return this; @@ -5376,7 +5376,7 @@ class MArgumentsLength : public MNullaryInstruction } public: - INSTRUCTION_HEADER(ArgumentsLength); + INSTRUCTION_HEADER(ArgumentsLength) static MArgumentsLength *New() { return new MArgumentsLength(); @@ -5404,7 +5404,7 @@ class MGetArgument } public: - INSTRUCTION_HEADER(GetArgument); + INSTRUCTION_HEADER(GetArgument) static MGetArgument *New(MDefinition *idx) { return new MGetArgument(idx); @@ -5445,7 +5445,7 @@ class MTypeBarrier : public MUnaryInstruction } public: - INSTRUCTION_HEADER(TypeBarrier); + INSTRUCTION_HEADER(TypeBarrier) static MTypeBarrier *New(MDefinition *def, const types::TypeSet *types) { return new MTypeBarrier(def, types); @@ -5488,7 +5488,7 @@ class MMonitorTypes : public MUnaryInstruction } public: - INSTRUCTION_HEADER(MonitorTypes); + INSTRUCTION_HEADER(MonitorTypes) static MMonitorTypes *New(MDefinition *def, const types::TypeSet *types) { return new MMonitorTypes(def, types); @@ -5515,7 +5515,7 @@ class MNewSlots : public MNullaryInstruction } public: - INSTRUCTION_HEADER(NewSlots); + INSTRUCTION_HEADER(NewSlots) static MNewSlots *New(unsigned nslots) { return new MNewSlots(nslots); @@ -5566,7 +5566,7 @@ class MNewCallObject : public MUnaryInstruction } public: - INSTRUCTION_HEADER(NewCallObject); + INSTRUCTION_HEADER(NewCallObject) static MNewCallObject *New(HandleObject templateObj, MDefinition *slots) { return new MNewCallObject(templateObj, slots); @@ -5597,7 +5597,7 @@ class MNewStringObject : } public: - INSTRUCTION_HEADER(NewStringObject); + INSTRUCTION_HEADER(NewStringObject) static MNewStringObject *New(MDefinition *input, HandleObject templateObj) { return new MNewStringObject(input, templateObj); @@ -5644,7 +5644,7 @@ class MFunctionBoundary : public MNullaryInstruction } public: - INSTRUCTION_HEADER(FunctionBoundary); + INSTRUCTION_HEADER(FunctionBoundary) static MFunctionBoundary *New(JSScript *script, Type type, unsigned inlineLevel = 0) { diff --git a/js/src/ion/VMFunctions.h b/js/src/ion/VMFunctions.h index eaa4396c1ab8..264b565bb61f 100644 --- a/js/src/ion/VMFunctions.h +++ b/js/src/ion/VMFunctions.h @@ -343,31 +343,31 @@ struct FunctionInfo : public VMFunction { template struct FunctionInfo : public VMFunction { typedef R (*pf)(JSContext *, A1); - FUNCTION_INFO_STRUCT_BODY(FOR_EACH_ARGS_1); + FUNCTION_INFO_STRUCT_BODY(FOR_EACH_ARGS_1) }; template struct FunctionInfo : public VMFunction { typedef R (*pf)(JSContext *, A1, A2); - FUNCTION_INFO_STRUCT_BODY(FOR_EACH_ARGS_2); + FUNCTION_INFO_STRUCT_BODY(FOR_EACH_ARGS_2) }; template struct FunctionInfo : public VMFunction { typedef R (*pf)(JSContext *, A1, A2, A3); - FUNCTION_INFO_STRUCT_BODY(FOR_EACH_ARGS_3); + FUNCTION_INFO_STRUCT_BODY(FOR_EACH_ARGS_3) }; template struct FunctionInfo : public VMFunction { typedef R (*pf)(JSContext *, A1, A2, A3, A4); - FUNCTION_INFO_STRUCT_BODY(FOR_EACH_ARGS_4); + FUNCTION_INFO_STRUCT_BODY(FOR_EACH_ARGS_4) }; template struct FunctionInfo : public VMFunction { typedef R (*pf)(JSContext *, A1, A2, A3, A4, A5); - FUNCTION_INFO_STRUCT_BODY(FOR_EACH_ARGS_5); + FUNCTION_INFO_STRUCT_BODY(FOR_EACH_ARGS_5) }; #undef FUNCTION_INFO_STRUCT_BODY diff --git a/js/src/ion/shared/LIR-x86-shared.h b/js/src/ion/shared/LIR-x86-shared.h index 5d31ec2abcd8..01c861768e0c 100644 --- a/js/src/ion/shared/LIR-x86-shared.h +++ b/js/src/ion/shared/LIR-x86-shared.h @@ -14,7 +14,7 @@ namespace ion { class LDivI : public LBinaryMath<1> { public: - LIR_HEADER(DivI); + LIR_HEADER(DivI) LDivI(const LAllocation &lhs, const LAllocation &rhs, const LDefinition &temp) { setOperand(0, lhs); @@ -33,7 +33,7 @@ class LDivI : public LBinaryMath<1> class LModI : public LBinaryMath<1> { public: - LIR_HEADER(ModI); + LIR_HEADER(ModI) LModI(const LAllocation &lhs, const LAllocation &rhs) { setOperand(0, lhs); @@ -50,7 +50,7 @@ class LModPowTwoI : public LInstructionHelper<1,1,0> const int32_t shift_; public: - LIR_HEADER(ModPowTwoI); + LIR_HEADER(ModPowTwoI) LModPowTwoI(const LAllocation &lhs, int32_t shift) : shift_(shift) @@ -70,7 +70,7 @@ class LModPowTwoI : public LInstructionHelper<1,1,0> class LPowHalfD : public LInstructionHelper<1, 1, 1> { public: - LIR_HEADER(PowHalfD); + LIR_HEADER(PowHalfD) LPowHalfD(const LAllocation &input, const LDefinition &temp) { setOperand(0, input); setTemp(0, temp); @@ -91,7 +91,7 @@ class LPowHalfD : public LInstructionHelper<1, 1, 1> class LTableSwitch : public LInstructionHelper<0, 1, 2> { public: - LIR_HEADER(TableSwitch); + LIR_HEADER(TableSwitch) LTableSwitch(const LAllocation &in, const LDefinition &inputCopy, const LDefinition &jumpTablePointer, MTableSwitch *ins) @@ -121,7 +121,7 @@ class LTableSwitch : public LInstructionHelper<0, 1, 2> class LTableSwitchV : public LInstructionHelper<0, BOX_PIECES, 3> { public: - LIR_HEADER(TableSwitchV); + LIR_HEADER(TableSwitchV) LTableSwitchV(const LDefinition &inputCopy, const LDefinition &floatCopy, const LDefinition &jumpTablePointer, MTableSwitch *ins) @@ -153,7 +153,7 @@ class LTableSwitchV : public LInstructionHelper<0, BOX_PIECES, 3> class LGuardShape : public LInstructionHelper<0, 1, 0> { public: - LIR_HEADER(GuardShape); + LIR_HEADER(GuardShape) LGuardShape(const LAllocation &in) { setOperand(0, in); @@ -166,7 +166,7 @@ class LGuardShape : public LInstructionHelper<0, 1, 0> class LRecompileCheck : public LInstructionHelper<0, 0, 0> { public: - LIR_HEADER(RecompileCheck); + LIR_HEADER(RecompileCheck) const MRecompileCheck *mir() const { return mir_->toRecompileCheck(); @@ -176,13 +176,13 @@ class LRecompileCheck : public LInstructionHelper<0, 0, 0> class LInterruptCheck : public LInstructionHelper<0, 0, 0> { public: - LIR_HEADER(InterruptCheck); + LIR_HEADER(InterruptCheck) }; class LMulI : public LBinaryMath<0, 1> { public: - LIR_HEADER(MulI); + LIR_HEADER(MulI) LMulI(const LAllocation &lhs, const LAllocation &rhs, const LAllocation &lhsCopy) { setOperand(0, lhs); diff --git a/js/src/ion/x64/LIR-x64.h b/js/src/ion/x64/LIR-x64.h index 07228c8b4faf..6879e9c4f580 100644 --- a/js/src/ion/x64/LIR-x64.h +++ b/js/src/ion/x64/LIR-x64.h @@ -19,7 +19,7 @@ class LBox : public LInstructionHelper<1, 1, 0> MIRType type_; public: - LIR_HEADER(Box); + LIR_HEADER(Box) LBox(MIRType type, const LAllocation &payload) : type_(type) @@ -50,7 +50,7 @@ class LUnboxBase : public LInstructionHelper<1, 1, 0> class LUnbox : public LUnboxBase { public: - LIR_HEADER(Unbox); + LIR_HEADER(Unbox) LUnbox(const LAllocation &input) : LUnboxBase(input) @@ -59,7 +59,7 @@ class LUnbox : public LUnboxBase { class LUnboxDouble : public LUnboxBase { public: - LIR_HEADER(UnboxDouble); + LIR_HEADER(UnboxDouble) LUnboxDouble(const LAllocation &input) : LUnboxBase(input) @@ -72,7 +72,7 @@ class LDouble : public LInstructionHelper<1, 0, 0> double d_; public: - LIR_HEADER(Double); + LIR_HEADER(Double) LDouble(double d) : d_(d) diff --git a/js/src/jsinfer.h b/js/src/jsinfer.h index 1b3fb4718237..5290f09da5a1 100644 --- a/js/src/jsinfer.h +++ b/js/src/jsinfer.h @@ -51,7 +51,7 @@ class TaggedProto template <> struct RootKind { - static ThingRootKind rootKind() { return THING_ROOT_OBJECT; }; + static ThingRootKind rootKind() { return THING_ROOT_OBJECT; } }; template <> struct RootMethods diff --git a/js/src/jswrapper.h b/js/src/jswrapper.h index 5ed7c5ea580d..1a220c0bfed4 100644 --- a/js/src/jswrapper.h +++ b/js/src/jswrapper.h @@ -49,8 +49,8 @@ class JS_FRIEND_API(Wrapper) : public DirectProxyHandler * is not safe to unwrap, operations requiring full access to the underlying * object (via UnwrapObjectChecked) will throw. Otherwise, they will succeed. */ - void setSafeToUnwrap(bool safe) { mSafeToUnwrap = safe; }; - bool isSafeToUnwrap() { return mSafeToUnwrap; }; + void setSafeToUnwrap(bool safe) { mSafeToUnwrap = safe; } + bool isSafeToUnwrap() { return mSafeToUnwrap; } static JSObject *New(JSContext *cx, JSObject *obj, JSObject *proto, JSObject *parent, Wrapper *handler); diff --git a/js/src/methodjit/FrameState.h b/js/src/methodjit/FrameState.h index 53f7e74a486a..d37d7eeb63b4 100644 --- a/js/src/methodjit/FrameState.h +++ b/js/src/methodjit/FrameState.h @@ -826,7 +826,7 @@ class FrameState #ifdef DEBUG void assertValidRegisterState() const; #else - inline void assertValidRegisterState() const {}; + inline void assertValidRegisterState() const {} #endif // Return an address, relative to the StackFrame, that represents where diff --git a/js/xpconnect/wrappers/ChromeObjectWrapper.h b/js/xpconnect/wrappers/ChromeObjectWrapper.h index bf862376447d..d40adc2f36f5 100644 --- a/js/xpconnect/wrappers/ChromeObjectWrapper.h +++ b/js/xpconnect/wrappers/ChromeObjectWrapper.h @@ -24,7 +24,7 @@ namespace xpc { class ChromeObjectWrapper : public ChromeObjectWrapperBase { public: - ChromeObjectWrapper() : ChromeObjectWrapperBase(0) {}; + ChromeObjectWrapper() : ChromeObjectWrapperBase(0) {} /* Custom traps. */ virtual bool getPropertyDescriptor(JSContext *cx, JSObject *wrapper, diff --git a/layout/mathml/nsMathMLmactionFrame.h b/layout/mathml/nsMathMLmactionFrame.h index 170bdeaacba8..ce3c505af79e 100644 --- a/layout/mathml/nsMathMLmactionFrame.h +++ b/layout/mathml/nsMathMLmactionFrame.h @@ -66,7 +66,7 @@ private: NS_DECL_ISUPPORTS NS_DECL_NSIDOMEVENTLISTENER - MouseListener(nsMathMLmactionFrame* aOwner) : mOwner(aOwner) { }; + MouseListener(nsMathMLmactionFrame* aOwner) : mOwner(aOwner) { } nsMathMLmactionFrame* mOwner; }; diff --git a/layout/xul/base/src/nsMenuFrame.h b/layout/xul/base/src/nsMenuFrame.h index 3fa3b35156ef..85f1ce6ecf3f 100644 --- a/layout/xul/base/src/nsMenuFrame.h +++ b/layout/xul/base/src/nsMenuFrame.h @@ -240,7 +240,7 @@ protected: NS_IMETHOD AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE; - virtual ~nsMenuFrame() { }; + virtual ~nsMenuFrame() { } bool SizeToPopup(nsBoxLayoutState& aState, nsSize& aSize); diff --git a/media/mtransport/test/sockettransportservice_unittest.cpp b/media/mtransport/test/sockettransportservice_unittest.cpp index 0da54d7e75dc..b1c19e292ac1 100644 --- a/media/mtransport/test/sockettransportservice_unittest.cpp +++ b/media/mtransport/test/sockettransportservice_unittest.cpp @@ -79,7 +79,7 @@ class SocketTransportServiceTest : public ::testing::Test { class EventReceived : public nsRunnable { public: EventReceived(SocketTransportServiceTest *test) : - test_(test) {}; + test_(test) {} NS_IMETHOD Run() { test_->ReceiveEvent(); @@ -94,7 +94,7 @@ public: class RegisterEvent : public nsRunnable { public: RegisterEvent(SocketTransportServiceTest *test) : - test_(test) {}; + test_(test) {} NS_IMETHOD Run() { test_->RegisterHandler(); diff --git a/media/mtransport/test/transport_unittests.cpp b/media/mtransport/test/transport_unittests.cpp index 143609af03e6..51bd7a85087b 100644 --- a/media/mtransport/test/transport_unittests.cpp +++ b/media/mtransport/test/transport_unittests.cpp @@ -74,7 +74,7 @@ class TransportLayerLossy : public TransportLayer { SignalPacketReceived(this, data, len); } - TRANSPORT_LAYER_ID("lossy"); + TRANSPORT_LAYER_ID("lossy") protected: virtual void WasInserted() { diff --git a/media/webrtc/signaling/include/CC_Call.h b/media/webrtc/signaling/include/CC_Call.h index 90171d798c7e..c1b9af6e561b 100644 --- a/media/webrtc/signaling/include/CC_Call.h +++ b/media/webrtc/signaling/include/CC_Call.h @@ -20,7 +20,7 @@ namespace CSF CC_Call () { } public: - virtual ~CC_Call () {}; + virtual ~CC_Call () {} virtual void setRemoteWindow (VideoWindowHandle window) = 0; diff --git a/media/webrtc/signaling/include/CC_Device.h b/media/webrtc/signaling/include/CC_Device.h index 4159152d06fa..ffa4b8d183f6 100644 --- a/media/webrtc/signaling/include/CC_Device.h +++ b/media/webrtc/signaling/include/CC_Device.h @@ -20,7 +20,7 @@ namespace CSF CC_Device() {} public: - virtual ~CC_Device() {}; + virtual ~CC_Device() {} virtual std::string toString() = 0; diff --git a/media/webrtc/signaling/src/common/NullTransport.h b/media/webrtc/signaling/src/common/NullTransport.h index 455b5593da9a..04d3154f65f1 100644 --- a/media/webrtc/signaling/src/common/NullTransport.h +++ b/media/webrtc/signaling/src/common/NullTransport.h @@ -32,7 +32,7 @@ public: NullTransport() {} - virtual ~NullTransport() {}; + virtual ~NullTransport() {} private: NullTransport(const NullTransport& other) MOZ_DELETE; diff --git a/media/webrtc/signaling/src/media-conduit/MediaConduitInterface.h b/media/webrtc/signaling/src/media-conduit/MediaConduitInterface.h index 1ecd20995ff2..7988f6b15dc4 100755 --- a/media/webrtc/signaling/src/media-conduit/MediaConduitInterface.h +++ b/media/webrtc/signaling/src/media-conduit/MediaConduitInterface.h @@ -26,7 +26,7 @@ namespace mozilla { class TransportInterface { public: - virtual ~TransportInterface() {}; + virtual ~TransportInterface() {} /** * RTP Transport Function to be implemented by concrete transport implementation @@ -58,7 +58,7 @@ public: class VideoRenderer { public: - virtual ~VideoRenderer() {} ; + virtual ~VideoRenderer() {} /** * Callback Function reportng any change in the video-frame dimensions @@ -106,7 +106,7 @@ class MediaSessionConduit public: enum Type { AUDIO, VIDEO } ; - virtual ~MediaSessionConduit() {}; + virtual ~MediaSessionConduit() {} virtual Type type() const = 0; @@ -159,7 +159,7 @@ public: */ static RefPtr Create(); - virtual ~VideoSessionConduit() {}; + virtual ~VideoSessionConduit() {} virtual Type type() const { return VIDEO; } @@ -228,7 +228,7 @@ public: */ static mozilla::RefPtr Create(); - virtual ~AudioSessionConduit() {}; + virtual ~AudioSessionConduit() {} virtual Type type() const { return AUDIO; } diff --git a/media/webrtc/trunk/src/voice_engine/include/voe_volume_control.h b/media/webrtc/trunk/src/voice_engine/include/voe_volume_control.h index 6d64e96086c8..8a9e236eff42 100644 --- a/media/webrtc/trunk/src/voice_engine/include/voe_volume_control.h +++ b/media/webrtc/trunk/src/voice_engine/include/voe_volume_control.h @@ -118,8 +118,8 @@ public: virtual int GetOutputVolumePan(int channel, float& left, float& right) = 0; protected: - VoEVolumeControl() {}; - virtual ~VoEVolumeControl() {}; + VoEVolumeControl() {} + virtual ~VoEVolumeControl() {} }; } // namespace webrtc diff --git a/netwerk/streamconv/test/TestStreamConv.cpp b/netwerk/streamconv/test/TestStreamConv.cpp index cc3eca988284..ccce04e01c67 100644 --- a/netwerk/streamconv/test/TestStreamConv.cpp +++ b/netwerk/streamconv/test/TestStreamConv.cpp @@ -55,7 +55,7 @@ public: // nsISupports declaration NS_DECL_ISUPPORTS - EndListener() {}; + EndListener() {} // nsIStreamListener method NS_IMETHOD OnDataAvailable(nsIRequest* request, nsISupports *ctxt, nsIInputStream *inStr, diff --git a/netwerk/test/TestCallbacks.cpp b/netwerk/test/TestCallbacks.cpp index a841982abfa2..0499a7b88932 100644 --- a/netwerk/test/TestCallbacks.cpp +++ b/netwerk/test/TestCallbacks.cpp @@ -53,7 +53,7 @@ public: *_retval = true; if (aPtr != this) *_retval = false; return NS_OK; - }; + } }; NS_IMPL_THREADSAFE_ISUPPORTS1(ConsumerContext, nsIEquals) diff --git a/security/manager/boot/src/nsSecureBrowserUIImpl.h b/security/manager/boot/src/nsSecureBrowserUIImpl.h index a1d067e6cb29..5d852c98927f 100644 --- a/security/manager/boot/src/nsSecureBrowserUIImpl.h +++ b/security/manager/boot/src/nsSecureBrowserUIImpl.h @@ -60,7 +60,7 @@ public: NS_IMETHOD Notify(nsIDOMHTMLFormElement* formNode, nsIDOMWindow* window, nsIURI *actionURL, bool* cancelSubmit); NS_IMETHOD NotifyInvalidSubmit(nsIDOMHTMLFormElement* formNode, - nsIArray* invalidElements) { return NS_OK; }; + nsIArray* invalidElements) { return NS_OK; } protected: mozilla::ReentrantMonitor mReentrantMonitor; diff --git a/security/manager/ssl/src/nsCertificatePrincipal.h b/security/manager/ssl/src/nsCertificatePrincipal.h index 182731e1859c..245727c11fb3 100644 --- a/security/manager/ssl/src/nsCertificatePrincipal.h +++ b/security/manager/ssl/src/nsCertificatePrincipal.h @@ -26,7 +26,7 @@ public: , mCert(aCert) {} - virtual ~nsCertificatePrincipal() {}; + virtual ~nsCertificatePrincipal() {} private: nsCString mFingerprint; diff --git a/toolkit/components/mediasniffer/nsMediaSniffer.h b/toolkit/components/mediasniffer/nsMediaSniffer.h index df060e3f6f8b..9ded2783a463 100644 --- a/toolkit/components/mediasniffer/nsMediaSniffer.h +++ b/toolkit/components/mediasniffer/nsMediaSniffer.h @@ -26,7 +26,7 @@ class nsMediaSniffer MOZ_FINAL : public nsIContentSniffer NS_DECL_ISUPPORTS NS_DECL_NSICONTENTSNIFFER protected: - ~nsMediaSniffer() {}; + ~nsMediaSniffer() {} #define PATTERN_ENTRY(mask, pattern, contentType) \ {(const uint8_t*)mask, (const uint8_t*)pattern, sizeof(mask) - 1, contentType} diff --git a/toolkit/components/url-classifier/Classifier.h b/toolkit/components/url-classifier/Classifier.h index bacad2e90cc8..fe0cbb906a37 100644 --- a/toolkit/components/url-classifier/Classifier.h +++ b/toolkit/components/url-classifier/Classifier.h @@ -58,9 +58,9 @@ public: */ nsresult MarkSpoiled(nsTArray& aTables); nsresult CacheCompletions(const CacheResultArray& aResults); - uint32_t GetHashKey(void) { return mHashKey; }; - void SetFreshTime(uint32_t aTime) { mFreshTime = aTime; }; - void SetPerClientRandomize(bool aRandomize) { mPerClientRandomize = aRandomize; }; + uint32_t GetHashKey(void) { return mHashKey; } + void SetFreshTime(uint32_t aTime) { mFreshTime = aTime; } + void SetPerClientRandomize(bool aRandomize) { mPerClientRandomize = aRandomize; } /* * Get a bunch of extra prefixes to query for completion * and mask the real entry being requested diff --git a/toolkit/components/url-classifier/HashStore.h b/toolkit/components/url-classifier/HashStore.h index 4c2d9b270a80..e00180a8c21c 100644 --- a/toolkit/components/url-classifier/HashStore.h +++ b/toolkit/components/url-classifier/HashStore.h @@ -45,8 +45,8 @@ public: void NewAddComplete(uint32_t aChunk, const Completion& aCompletion); void NewSubComplete(uint32_t aAddChunk, const Completion& aCompletion, uint32_t aSubChunk); - void SetLocalUpdate(void) { mLocalUpdate = true; }; - bool IsLocalUpdate(void) { return mLocalUpdate; }; + void SetLocalUpdate(void) { mLocalUpdate = true; } + bool IsLocalUpdate(void) { return mLocalUpdate; } ChunkSet& AddChunks() { return mAddChunks; } ChunkSet& SubChunks() { return mSubChunks; } @@ -79,7 +79,7 @@ public: HashStore(const nsACString& aTableName, nsIFile* aStoreFile); ~HashStore(); - const nsCString& TableName() const { return mTableName; }; + const nsCString& TableName() const { return mTableName; } nsresult Open(); nsresult AugmentAdds(const nsTArray& aPrefixes); diff --git a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp index a244d3aa3eac..03bb0aa161f5 100644 --- a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp +++ b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp @@ -37,7 +37,7 @@ class nsPrefixSetReporter : public nsIMemoryReporter { public: nsPrefixSetReporter(nsUrlClassifierPrefixSet* aParent, const nsACString& aName); - virtual ~nsPrefixSetReporter() {}; + virtual ~nsPrefixSetReporter() {} NS_DECL_ISUPPORTS NS_DECL_NSIMEMORYREPORTER diff --git a/toolkit/system/gnome/nsGSettingsService.cpp b/toolkit/system/gnome/nsGSettingsService.cpp index a6e30e47e974..b69b2f16de2d 100644 --- a/toolkit/system/gnome/nsGSettingsService.cpp +++ b/toolkit/system/gnome/nsGSettingsService.cpp @@ -84,7 +84,7 @@ public: NS_DECL_NSIGSETTINGSCOLLECTION nsGSettingsCollection(GSettings* aSettings) : mSettings(aSettings), - mKeys(NULL) {}; + mKeys(NULL) {} ~nsGSettingsCollection(); private: diff --git a/xpcom/tests/TestAutoPtr.cpp b/xpcom/tests/TestAutoPtr.cpp index 36c458b168f7..d4d84e47833e 100644 --- a/xpcom/tests/TestAutoPtr.cpp +++ b/xpcom/tests/TestAutoPtr.cpp @@ -12,14 +12,14 @@ class TestObjectBaseA { public: // Virtual dtor for deleting through base class pointer - virtual ~TestObjectBaseA() { }; + virtual ~TestObjectBaseA() { } int fooA; }; class TestObjectBaseB { public: // Virtual dtor for deleting through base class pointer - virtual ~TestObjectBaseB() { }; + virtual ~TestObjectBaseB() { } int fooB; }; diff --git a/xpcom/tests/TestHashtables.cpp b/xpcom/tests/TestHashtables.cpp index 2a42fe35d53d..221f8d721f77 100644 --- a/xpcom/tests/TestHashtables.cpp +++ b/xpcom/tests/TestHashtables.cpp @@ -72,7 +72,7 @@ public: EntityToUnicodeEntry(const char* aKey) { mNode = nullptr; } EntityToUnicodeEntry(const EntityToUnicodeEntry& aEntry) { mNode = aEntry.mNode; } - ~EntityToUnicodeEntry() { }; + ~EntityToUnicodeEntry() { } bool KeyEquals(const char* aEntity) const { return !strcmp(mNode->mStr, aEntity); } static const char* KeyToPointer(const char* aEntity) { return aEntity; } diff --git a/xpcom/tests/TestSettingsAPI.cpp b/xpcom/tests/TestSettingsAPI.cpp index de6241bda9db..d1c5eb1fab9e 100644 --- a/xpcom/tests/TestSettingsAPI.cpp +++ b/xpcom/tests/TestSettingsAPI.cpp @@ -85,13 +85,13 @@ public: } callbackCount--; return NS_OK; - }; + } NS_IMETHOD HandleError(const nsAString &name) { fprintf(stderr, "HANDLE Error! %s\n", NS_LossyConvertUTF16toASCII(name).get()); errors++; return NS_OK; - }; + } }; NS_IMPL_THREADSAFE_ISUPPORTS1(SettingsServiceCallback, nsISettingsServiceCallback)