diff --git a/main.cpp b/main.cpp index 2404ee96c0..d115ee09c7 100644 --- a/main.cpp +++ b/main.cpp @@ -159,7 +159,7 @@ int executeLLVMCode(void *codePtr) void (*code)(VM::ExecutionContext *) = (void (*)(VM::ExecutionContext *)) codePtr; QScopedPointer iSelFactory(new QQmlJS::Moth::ISelFactory); - VM::ExecutionEngine vm(0, iSelFactory.data()); + VM::ExecutionEngine vm(iSelFactory.data()); VM::ExecutionContext *ctx = vm.rootContext; QQmlJS::VM::Object *globalObject = vm.globalObject.objectValue(); diff --git a/qmljs_value.h b/qmljs_value.h index b8c78d3f1f..48ec2d4541 100644 --- a/qmljs_value.h +++ b/qmljs_value.h @@ -125,8 +125,8 @@ struct Value }; - inline ValueType type() const { - return (ValueType)(tag & Type_Mask); + inline unsigned type() const { + return tag & Type_Mask; } inline bool isUndefined() const { return tag == _Undefined_Type; } diff --git a/qv4mm.cpp b/qv4mm.cpp index fe652b4028..9339b38244 100644 --- a/qv4mm.cpp +++ b/qv4mm.cpp @@ -165,7 +165,7 @@ Managed *MemoryManager::alloc(std::size_t size) void MemoryManager::scribble(Managed *obj, int c, int size) const { if (m_d->scribble) - ::memset(obj + 1, c, size - sizeof(Managed)); + ::memset((void *)(obj + 1), c, size - sizeof(Managed)); } std::size_t MemoryManager::mark(const QVector &objects) diff --git a/v4.pro b/v4.pro index 80687b4ca5..e947da90bb 100644 --- a/v4.pro +++ b/v4.pro @@ -64,6 +64,8 @@ INCLUDEPATH += \ $$system($$LLVM_CONFIG --includedir) QMAKE_CXXFLAGS += $$system($$LLVM_CONFIG --cppflags) -fvisibility-inlines-hidden +QMAKE_CXXFLAGS -= -pedantic +QMAKE_CXXFLAGS -= -Wcovered-switch-default LIBS += \ $$system($$LLVM_CONFIG --ldflags) \ @@ -72,6 +74,7 @@ LIBS += \ QMAKE_EXTRA_TARGETS += gen_llvm_runtime GEN_LLVM_RUNTIME_FLAGS = $$system($$LLVM_CONFIG --cppflags) +GEN_LLVM_RUNTIME_FLAGS -= -pedantic gen_llvm_runtime.target = llvm_runtime gen_llvm_runtime.commands = clang -O2 -emit-llvm -c $(INCPATH) $$GEN_LLVM_RUNTIME_FLAGS -DQMLJS_LLVM_RUNTIME llvm_runtime.cpp -o llvm_runtime.bc