From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 17:09:59 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A1FA285B; Wed, 26 Nov 2014 17:09:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8E0BD3A7; Wed, 26 Nov 2014 17:09:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQH9xHo054864; Wed, 26 Nov 2014 17:09:59 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQH9wAG054855; Wed, 26 Nov 2014 17:09:58 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201411261709.sAQH9wAG054855@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 26 Nov 2014 17:09:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275127 - in projects/clang350-import/contrib/llvm/tools/lldb/source: Expression Symbol X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 17:09:59 -0000 Author: emaste Date: Wed Nov 26 17:09:58 2014 New Revision: 275127 URL: https://svnweb.freebsd.org/changeset/base/275127 Log: Revert LLDB changes for Clang/LLVM 3.5 API compatibility This reverts the following upstream revisions: SVN git 214501 26d6f063 215969 a083c0db 216603 ee9cd340 216810 f534f503 Sponsored by: DARPA, AFRL Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/IRExecutionUnit.cpp projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTContext.cpp Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp Wed Nov 26 16:48:12 2014 (r275126) +++ projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp Wed Nov 26 17:09:58 2014 (r275127) @@ -333,8 +333,8 @@ ClangExpressionParser::Parse (Stream &st if (!created_main_file) { - std::unique_ptr memory_buffer = MemoryBuffer::getMemBufferCopy(expr_text, __FUNCTION__); - SourceMgr.setMainFileID(SourceMgr.createFileID(std::move(memory_buffer))); + MemoryBuffer *memory_buffer = MemoryBuffer::getMemBufferCopy(expr_text, __FUNCTION__); + SourceMgr.setMainFileID(SourceMgr.createFileID(memory_buffer)); } diag_buf->BeginSourceFile(m_compiler->getLangOpts(), &m_compiler->getPreprocessor()); Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/IRExecutionUnit.cpp ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/IRExecutionUnit.cpp Wed Nov 26 16:48:12 2014 (r275126) +++ projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/IRExecutionUnit.cpp Wed Nov 26 17:09:58 2014 (r275127) @@ -295,7 +295,7 @@ IRExecutionUnit::GetRunnableInfo(Error & m_module_ap->getContext().setInlineAsmDiagnosticHandler(ReportInlineAsmError, &error); - llvm::EngineBuilder builder(std::move(m_module_ap)); + llvm::EngineBuilder builder(m_module_ap.get()); builder.setEngineKind(llvm::EngineKind::JIT) .setErrorStr(&error_string) @@ -326,6 +326,10 @@ IRExecutionUnit::GetRunnableInfo(Error & error.SetErrorStringWithFormat("Couldn't JIT the function: %s", error_string.c_str()); return; } + else + { + m_module_ap.release(); // ownership was transferred + } // Make sure we see all sections, including ones that don't have relocations... m_execution_engine_ap->setProcessAllSections(true); Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTContext.cpp ============================================================================== --- projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTContext.cpp Wed Nov 26 16:48:12 2014 (r275126) +++ projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTContext.cpp Wed Nov 26 17:09:58 2014 (r275127) @@ -1778,10 +1778,12 @@ ClangASTContext::CreateFunctionType (AST // TODO: Detect calling convention in DWARF? FunctionProtoType::ExtProtoInfo proto_info; proto_info.Variadic = is_variadic; - proto_info.ExceptionSpec = EST_None; + proto_info.ExceptionSpecType = EST_None; proto_info.TypeQuals = type_quals; proto_info.RefQualifier = RQ_None; - + proto_info.NumExceptions = 0; + proto_info.Exceptions = nullptr; + return ClangASTType (ast, ast->getFunctionType (result_type.GetQualType(), qual_type_args, proto_info).getAsOpaquePtr());