adda9a5022
More changes for HPHP to help make it clang friendly ~~~hphp/compiler/expression/constant_expression.h ~~~hphp/compiler/expression/function_call.h rfind returns a size_t/unsigned int ~~~hphp/runtime/base/server/http_protocol.cpp Switched to std::to_string. Assuming [] was not intended here ~~~hphp/runtime/base/ref_data.h These fields were accessed in a public manner, assuming public was intended instead of private ~~~hphp/runtime/base/variable_serializer.cpp Switched to using [] and & to make clang happy. Assuming this was to either take or drop the first char. ~~~hphp/runtime/ext/asio/asio_external_thread_event_queue.h ~~~hphp/runtime/ext/asio/asio_external_thread_event_queue.cpp Cast which performs the conversions of a reinterpret_cast is not allowed in a constant expression. This is been moved to a macro as a temporary fix. +++hphp/runtime/ext/ext_misc.cpp Added std::atomic to supress warnings ~~~hphp/runtime/vm/jit/simplifier.cpp Chosen constructor is explicit in copy-initialization ~~~hphp/runtime/vm/jit/translator-asm-helpers.S Ambiguous instructions require an explicit suffix Changed cmp to cmpl ~~~hphp/runtime/vm/jit/translator-x64-helpers.cpp Clang does not support global register variables +++hphp/runtime/vm/unwind.cpp describeFault was only used when DEBUG or USE_TRACE was defined ~~~hphp/runtime/vm/verifier/check_unit.cpp Made fmt pointer const to avoid string format issues/warnings ~~~hphp/util/stack_trace.cpp Clang does not support variable-length arrays. Uniqe_ptr is used instead to take advantage runtime-sized arrays, a restriced form of variable-length arrays ~~~hphp/util/thread_local.h Clang seems to be supporting the __thread attribute, or at the very least it is not complaining about it. ~~~hphp/util/tiny_vector.h Clang does not like the flexible array here, since T is not always POD. I have reimplemented the array here by just sticking one value in the struct and calculating the offset from its address manually. Alterinatively, we could change the the non-POD types to be pointers, or we could edit their implemenations. +++hphp/util/util.h Created a template for the union, A function declared with the constexpr specifier cannot contain type declarations that do not define classes or enumerations +++hphp/runtime/vm/jit/x64-util.h Added a TODO The way hphp/runtime/vm/jit/x64-util.h is currently implemented, it only works if USE_GCC_FAST_TLS is defined
129 linhas
3.8 KiB
C++
129 linhas
3.8 KiB
C++
/*
|
|
+----------------------------------------------------------------------+
|
|
| HipHop for PHP |
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) |
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 3.01 of the PHP license, |
|
|
| that is bundled with this package in the file LICENSE, and is |
|
|
| available through the world-wide-web at the following url: |
|
|
| http://www.php.net/license/3_01.txt |
|
|
| If you did not receive a copy of the PHP license and are unable to |
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
| license@php.net so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
#ifndef incl_HPHP_INSIDE_HPHP_COMPLEX_TYPES_H_
|
|
#error Directly including 'ref_data.h' is prohibited. \
|
|
Include 'complex_types.h' instead.
|
|
#endif
|
|
|
|
#ifndef incl_HPHP_REF_DATA_H
|
|
#define incl_HPHP_REF_DATA_H
|
|
|
|
namespace HPHP {
|
|
|
|
/**
|
|
* We heap allocate a RefData when we make a reference to something.
|
|
* A Variant or TypedValue can be KindOfRef and point to a RefData,
|
|
* but the value held here must not be KindOfRef.
|
|
*/
|
|
class RefData {
|
|
enum Magic : uint64_t { kMagic = 0xfacefaceb00cb00c };
|
|
public:
|
|
enum NullInit { nullinit };
|
|
RefData() { assert(m_magic = kMagic); }
|
|
RefData(NullInit) {
|
|
assert(m_magic = kMagic);
|
|
_count = 1;
|
|
m_tv.m_type = KindOfNull;
|
|
}
|
|
RefData(DataType t, int64_t datum) {
|
|
assert(m_magic = kMagic);
|
|
init(t, datum);
|
|
}
|
|
~RefData();
|
|
|
|
// Don't extend Countable but use these methods to directly
|
|
// update _count, declared below.
|
|
IMPLEMENT_COUNTABLE_METHODS_NO_STATIC
|
|
|
|
// Memory allocator methods
|
|
DECLARE_SMART_ALLOCATION(RefData);
|
|
void dump() const;
|
|
|
|
const TypedValue* tv() const {
|
|
assert(m_magic == kMagic);
|
|
return &m_tv;
|
|
}
|
|
TypedValue* tv() {
|
|
assert(m_magic == kMagic);
|
|
return &m_tv;
|
|
}
|
|
const Variant* var() const { return (const Variant*)tv(); }
|
|
Variant* var() { return reinterpret_cast<Variant*>(tv()); }
|
|
|
|
static constexpr size_t tvOffset() { return offsetof(RefData, m_tv); }
|
|
|
|
void assertValid() const {
|
|
assert(m_magic == kMagic);
|
|
}
|
|
|
|
// TODO: t2221110: get rid of this hack.
|
|
static RefData* refDataFromVariantIfYouDare(const Variant* var) {
|
|
RefData* ref = reinterpret_cast<RefData*>(uintptr_t(var) - tvOffset());
|
|
ref->assertValid();
|
|
return ref;
|
|
}
|
|
|
|
private:
|
|
// initialize this value by laundering uninitNull -> Null
|
|
void init(DataType t, int64_t datum) {
|
|
_count = 1;
|
|
if (!IS_NULL_TYPE(t)) {
|
|
m_tv.m_type = t;
|
|
m_tv.m_data.num = datum;
|
|
} else {
|
|
m_tv.m_type = KindOfNull;
|
|
}
|
|
}
|
|
|
|
static void compileTimeAsserts() {
|
|
static_assert(offsetof(RefData, _count) == FAST_REFCOUNT_OFFSET, "");
|
|
}
|
|
|
|
#if defined(DEBUG) || defined(PACKED_TV)
|
|
// don't overlap TypedValue with _count. sizeof(*this) = 32.
|
|
private: Magic m_magic;
|
|
public: mutable int32_t _count;
|
|
private: TypedValue m_tv;
|
|
static void layoutAsserts() {
|
|
static_assert(offsetof(RefData, m_tv) >
|
|
offsetof(RefData, _count) + sizeof(int32_t), "");
|
|
};
|
|
#else
|
|
// overlap TypedValue with count
|
|
public:
|
|
union {
|
|
struct {
|
|
void* _ptr;
|
|
mutable int32_t _count;
|
|
};
|
|
TypedValue m_tv;
|
|
};
|
|
static void layoutAsserts() {
|
|
static_assert(offsetof(RefData, _count) == TypedValueAux::auxOffset, "");
|
|
static_assert(sizeof(RefData::_count) == TypedValueAux::auxSize, "");
|
|
}
|
|
#endif
|
|
};
|
|
|
|
ALWAYS_INLINE inline void decRefRef(RefData* ref) {
|
|
if (ref->decRefCount() == 0) ref->release();
|
|
}
|
|
|
|
} // namespace HPHP
|
|
|
|
#endif //incl_HPHP_REF_DATA_H
|