Skip to content

Commit 71bb00e

Browse files
svenpanneCommit bot
svenpanne
authored and
Commit bot
committed
Consistently use only one of virtual/OVERRIDE/FINAL.
FINAL implies OVERRIDE, which in turn implies virtual, so there's no need to use more than one of these. The Google C++ style guide even requires this, see http://google-styleguide.googlecode.com/svn/trunk/cppguide.html#Inheritance. While we're here, port r24662 to x87. The net result is that v8 compiles again with a current clang. BUG=v8:3753 LOG=y Review URL: https://codereview.chromium.org/797943002 Cr-Commit-Position: refs/heads/master@{#25792}
1 parent 0d8fb5d commit 71bb00e

64 files changed

Lines changed: 1665 additions & 1990 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build/standalone.gypi‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -238,13 +238,6 @@
238238
],
239239
},
240240
}],
241-
['clang==1', {
242-
'target_defaults': {
243-
# Remove once issue 3753 is fixed.
244-
'cflags_cc': [ '-Wno-inconsistent-missing-override',
245-
'-Wno-unknown-warning-option', ],
246-
},
247-
}],
248241
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
249242
or OS=="netbsd"', {
250243
'target_defaults': {

‎src/arm/code-stubs-arm.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class RecordWriteStub: public PlatformCodeStub {
7474
INCREMENTAL_COMPACTION
7575
};
7676

77-
virtual bool SometimesSetsUpAFrame() { return false; }
77+
bool SometimesSetsUpAFrame() OVERRIDE { return false; }
7878

7979
static void PatchBranchIntoNop(MacroAssembler* masm, int pos) {
8080
masm->instr_at_put(pos, (masm->instr_at(pos) & ~B27) | (B24 | B20));
@@ -197,17 +197,17 @@ class RecordWriteStub: public PlatformCodeStub {
197197
kUpdateRememberedSetOnNoNeedToInformIncrementalMarker
198198
};
199199

200-
virtual inline Major MajorKey() const FINAL OVERRIDE { return RecordWrite; }
200+
inline Major MajorKey() const FINAL { return RecordWrite; }
201201

202-
virtual void Generate(MacroAssembler* masm) OVERRIDE;
202+
void Generate(MacroAssembler* masm) OVERRIDE;
203203
void GenerateIncremental(MacroAssembler* masm, Mode mode);
204204
void CheckNeedsToInformIncrementalMarker(
205205
MacroAssembler* masm,
206206
OnNoNeedToInformIncrementalMarker on_no_need,
207207
Mode mode);
208208
void InformIncrementalMarker(MacroAssembler* masm);
209209

210-
void Activate(Code* code) {
210+
void Activate(Code* code) OVERRIDE {
211211
code->GetHeap()->incremental_marking()->ActivateGeneratedStub(code);
212212
}
213213

@@ -255,7 +255,7 @@ class DirectCEntryStub: public PlatformCodeStub {
255255
void GenerateCall(MacroAssembler* masm, Register target);
256256

257257
private:
258-
bool NeedsImmovableCode() { return true; }
258+
bool NeedsImmovableCode() OVERRIDE { return true; }
259259

260260
DEFINE_NULL_CALL_INTERFACE_DESCRIPTOR();
261261
DEFINE_PLATFORM_CODE_STUB(DirectCEntry, PlatformCodeStub);
@@ -287,7 +287,7 @@ class NameDictionaryLookupStub: public PlatformCodeStub {
287287
Register r0,
288288
Register r1);
289289

290-
virtual bool SometimesSetsUpAFrame() { return false; }
290+
bool SometimesSetsUpAFrame() OVERRIDE { return false; }
291291

292292
private:
293293
static const int kInlinedProbes = 4;

0 commit comments

Comments
 (0)