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

Bug 920292 - Part 1: Stop passing string literals as the first argument to MOZ_ASSERT; r=Waldo

Browse Source
This commit is contained in:
Ehsan Akhgari 2013-10-01 08:25:08 -04:00
parent eb23bcadad
commit fe43f6784d
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/audiochannel/AudioChannelService.cpp
View File

@ -679,7 +679,7 @@ AudioChannelService::Observe(nsISupports* aSubject, const char* aTopic, const PR
} else if (keyStr.EqualsLiteral("audio.volume.telephony")) {
audioManager->SetAudioChannelVolume(AUDIO_CHANNEL_TELEPHONY, index);
} else {
MOZ_ASSERT("unexpected audio channel for volume control");
MOZ_ASSUME_UNREACHABLE("unexpected audio channel for volume control");
}
}
#endif

2
dom/system/gonk/AudioManager.cpp
View File

@ -138,7 +138,7 @@ public:
static_cast<AudioManager *>(audioManager.get())->SetStreamVolumeIndex(
AUDIO_STREAM_BLUETOOTH_SCO, volIndex);
} else {
MOZ_ASSERT("unexpected audio channel for volume control");
MOZ_ASSUME_UNREACHABLE("unexpected audio channel for volume control");
}
return NS_OK;

2
dom/wifi/NetUtils.h
View File

@ -54,7 +54,7 @@ public:
#define USE_DLFUNC(name) \
FUNC##name name = (FUNC##name) dlsym(GetSharedLibrary(), #name); \
if (!name) { \
MOZ_ASSERT("Symbol not found in shared library : " #name); \
MOZ_ASSUME_UNREACHABLE("Symbol not found in shared library : " #name); \
}
#endif // NetUtils_h

12
js/src/assembler/assembler/MacroAssemblerARM.h
View File

@ -478,7 +478,7 @@ public:
void store16(TrustedImm32 imm, BaseIndex address)
{
if (imm.m_isPointer)
JS_ASSERT("What are you trying to do with 16 bits of a pointer?");
MOZ_ASSUME_UNREACHABLE("What are you trying to do with 16 bits of a pointer?");
else
move(imm, ARMRegisters::S1);
store16(ARMRegisters::S1, address);
@ -486,7 +486,7 @@ public:
void store16(TrustedImm32 imm, ImplicitAddress address)
{
if (imm.m_isPointer)
JS_ASSERT("What are you trying to do with 16 bits of a pointer?");
MOZ_ASSUME_UNREACHABLE("What are you trying to do with 16 bits of a pointer?");
else
move(imm, ARMRegisters::S1);
store16(ARMRegisters::S1, address);
@ -502,7 +502,7 @@ public:
{
m_assembler.ldr_un_imm(ARMRegisters::S0, reinterpret_cast<ARMWord>(address));
if (imm.m_isPointer)
JS_ASSERT("What are you trying to do with 16 bits of a pointer?");
MOZ_ASSUME_UNREACHABLE("What are you trying to do with 16 bits of a pointer?");
else
m_assembler.moveImm(imm.m_value, ARMRegisters::S1);
m_assembler.mem_imm_off(false, false, 16, true, ARMRegisters::S1, ARMRegisters::S0, 0);
@ -521,7 +521,7 @@ public:
void store8(TrustedImm32 imm, BaseIndex address)
{
if (imm.m_isPointer)
JS_ASSERT("What are you trying to do with 8 bits of a pointer?");
MOZ_ASSUME_UNREACHABLE("What are you trying to do with 8 bits of a pointer?");
else
move(imm, ARMRegisters::S1);
store8(ARMRegisters::S1, address);
@ -530,7 +530,7 @@ public:
void store8(TrustedImm32 imm, ImplicitAddress address)
{
if (imm.m_isPointer)
JS_ASSERT("What are you trying to do with 16 bits of a pointer?");
MOZ_ASSUME_UNREACHABLE("What are you trying to do with 16 bits of a pointer?");
else
move(imm, ARMRegisters::S1);
store8(ARMRegisters::S1, address);
@ -546,7 +546,7 @@ public:
{
m_assembler.ldr_un_imm(ARMRegisters::S0, reinterpret_cast<ARMWord>(address));
if (imm.m_isPointer)
JS_ASSERT("What are you trying to do with 16 bits of a pointer?");
MOZ_ASSUME_UNREACHABLE("What are you trying to do with 16 bits of a pointer?");
else
m_assembler.moveImm(imm.m_value, ARMRegisters::S1);
m_assembler.mem_imm_off(false, false, 8, true, ARMRegisters::S1, ARMRegisters::S0, 0);

2
js/src/jit/arm/Assembler-arm.h
View File

@ -1702,7 +1702,7 @@ class Assembler
JS_ASSERT(rn.code() > dtmLastReg);
dtmRegBitField |= 1 << rn.code();
if (dtmLoadStore == IsLoad && rn.code() == 13 && dtmBase.code() == 13) {
JS_ASSERT("ARM Spec says this is invalid");
MOZ_ASSUME_UNREACHABLE("ARM Spec says this is invalid");
}
}
void finishDataTransfer() {