mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
5ee21d6d3f
This patch was mostly generated by running the following scripts on the codebase, with some
manual changes made afterwards:
# static_assert.sh
#!/bin/bash
# Command to convert an NSPR integer type to the equivalent standard integer type
function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
! -wholename "*security/nss*" \
! -wholename "*/.hg*" \
! -wholename "obj-ff-dbg*" \
! -name nsXPCOMCID.h \
! -name prtypes.h \
-type f \
\( -iname "*.cpp" \
-o -iname "*.h" \
-o -iname "*.cc" \
-o -iname "*.mm" \) | \
xargs -n 1 `dirname $0`/assert_replacer.py #sed -i -e "s/\b$1\b/$2/g"
}
convert MOZ_STATIC_ASSERT static_assert
hg rev --no-backup mfbt/Assertions.h \
media/webrtc/signaling/src/sipcc/core/includes/ccapi.h \
modules/libmar/src/mar_private.h \
modules/libmar/src/mar.h
# assert_replacer.py
#!/usr/bin/python
import sys
import re
pattern = re.compile(r"\bMOZ_STATIC_ASSERT\b")
def replaceInPlace(fname):
print fname
f = open(fname, "rw+")
lines = f.readlines()
for i in range(0, len(lines)):
while True:
index = re.search(pattern, lines[i])
if index != None:
index = index.start()
lines[i] = lines[i][0:index] + "static_assert" + lines[i][index+len("MOZ_STATIC_ASSERT"):]
for j in range(i + 1, len(lines)):
if lines[j].find(" ", index) == index:
lines[j] = lines[j][0:index] + lines[j][index+4:]
else:
break
else:
break
f.seek(0, 0)
f.truncate()
f.write("".join(lines))
f.close()
argc = len(sys.argv)
for i in range(1, argc):
replaceInPlace(sys.argv[i])
--HG--
extra : rebase_source : 4b4a4047d82f2c205b9fad8d56dfc3f1afc0b045
58 lines
1.8 KiB
C++
58 lines
1.8 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "nsRuleData.h"
|
|
|
|
#include "mozilla/Poison.h"
|
|
#include <stdint.h>
|
|
|
|
inline size_t
|
|
nsRuleData::GetPoisonOffset()
|
|
{
|
|
// Fill in mValueOffsets such that mValueStorage + mValueOffsets[i]
|
|
// will yield the frame poison value for all uninitialized value
|
|
// offsets.
|
|
static_assert(sizeof(uintptr_t) == sizeof(size_t),
|
|
"expect uintptr_t and size_t to be the same size");
|
|
static_assert(uintptr_t(-1) > uintptr_t(0),
|
|
"expect uintptr_t to be unsigned");
|
|
static_assert(size_t(-1) > size_t(0),
|
|
"expect size_t to be unsigned");
|
|
uintptr_t framePoisonValue = mozPoisonValue();
|
|
return size_t(framePoisonValue - uintptr_t(mValueStorage)) /
|
|
sizeof(nsCSSValue);
|
|
}
|
|
|
|
nsRuleData::nsRuleData(uint32_t aSIDs, nsCSSValue* aValueStorage,
|
|
nsPresContext* aContext, nsStyleContext* aStyleContext)
|
|
: mSIDs(aSIDs),
|
|
mCanStoreInRuleTree(true),
|
|
mPresContext(aContext),
|
|
mStyleContext(aStyleContext),
|
|
mValueStorage(aValueStorage)
|
|
{
|
|
#ifndef MOZ_VALGRIND
|
|
size_t framePoisonOffset = GetPoisonOffset();
|
|
for (size_t i = 0; i < nsStyleStructID_Length; ++i) {
|
|
mValueOffsets[i] = framePoisonOffset;
|
|
}
|
|
#endif
|
|
}
|
|
|
|
#ifdef DEBUG
|
|
nsRuleData::~nsRuleData()
|
|
{
|
|
#ifndef MOZ_VALGRIND
|
|
// assert nothing in mSIDs has poison value
|
|
size_t framePoisonOffset = GetPoisonOffset();
|
|
for (size_t i = 0; i < nsStyleStructID_Length; ++i) {
|
|
NS_ABORT_IF_FALSE(!(mSIDs & (1 << i)) ||
|
|
mValueOffsets[i] != framePoisonOffset,
|
|
"value in SIDs was left with poison offset");
|
|
}
|
|
#endif
|
|
}
|
|
#endif
|