From 2bd6c60752bbfc568c1fdf358a68480ddd437def Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 19 Jun 2017 21:36:54 -0400 Subject: update for llvm 5.0.0rc1 --- src/parseh.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/parseh.cpp') diff --git a/src/parseh.cpp b/src/parseh.cpp index fa474850b2..cb51ccb327 100644 --- a/src/parseh.cpp +++ b/src/parseh.cpp @@ -341,7 +341,6 @@ static TypeTableEntry *resolve_type_with_table(Context *c, const Type *ty, const case BuiltinType::OCLEvent: case BuiltinType::OCLClkEvent: case BuiltinType::OCLQueue: - case BuiltinType::OCLNDRange: case BuiltinType::OCLReserveID: emit_warning(c, decl, "missed a builtin type"); return c->codegen->builtin_types.entry_invalid; @@ -445,8 +444,8 @@ static TypeTableEntry *resolve_type_with_table(Context *c, const Type *ty, const case CC_X86Pascal: // __attribute__((pascal)) emit_warning(c, decl, "function type has x86 pascal calling convention"); return c->codegen->builtin_types.entry_invalid; - case CC_X86_64Win64: // __attribute__((ms_abi)) - emit_warning(c, decl, "function type has x86 64win64 calling convention"); + case CC_Win64: // __attribute__((ms_abi)) + emit_warning(c, decl, "function type has win64 calling convention"); return c->codegen->builtin_types.entry_invalid; case CC_X86_64SysV: // __attribute__((sysv_abi)) emit_warning(c, decl, "function type has x86 64sysv calling convention"); @@ -586,6 +585,7 @@ static TypeTableEntry *resolve_type_with_table(Context *c, const Type *ty, const case Type::Atomic: case Type::Pipe: case Type::ObjCTypeParam: + case Type::DeducedTemplateSpecialization: emit_warning(c, decl, "missed a '%s' type", ty->getTypeClassName()); return c->codegen->builtin_types.entry_invalid; } @@ -1369,6 +1369,8 @@ int parse_h_file(ImportTableEntry *import, ZigList *errors, const ch bool capture_diagnostics = true; bool user_files_are_volatile = true; bool allow_pch_with_compiler_errors = false; + bool single_file_parse = false; + bool for_serialization = false; const char *resources_path = ZIG_HEADERS_DIR; std::unique_ptr err_unit; std::unique_ptr ast_unit(ASTUnit::LoadFromCommandLine( @@ -1376,7 +1378,8 @@ int parse_h_file(ImportTableEntry *import, ZigList *errors, const ch pch_container_ops, diags, resources_path, only_local_decls, capture_diagnostics, None, true, 0, TU_Complete, false, false, allow_pch_with_compiler_errors, skip_function_bodies, - user_files_are_volatile, false, None, &err_unit)); + single_file_parse, user_files_are_volatile, for_serialization, None, &err_unit, + nullptr)); // Early failures in LoadFromCommandLine may return with ErrUnit unset. -- cgit v1.2.3