From b36845da83c67682f640273b08ed419ed711a63d Mon Sep 17 00:00:00 2001 From: Tim Northover Date: Thu, 1 Nov 2018 18:37:42 +0000 Subject: [PATCH] Revert "Reapply Logging: make os_log buffer size an integer constant expression." Still more dependency hell. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@345871 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/{AST => Analysis/Analyses}/OSLog.h | 0 lib/AST/CMakeLists.txt | 1 - lib/AST/ExprConstant.cpp | 7 ------- lib/Analysis/CMakeLists.txt | 1 + lib/{AST => Analysis}/OSLog.cpp | 2 +- lib/Analysis/PrintfFormatString.cpp | 2 +- lib/CodeGen/CGBuiltin.cpp | 9 ++++++++- test/CodeGen/builtins.c | 13 +++++-------- 8 files changed, 16 insertions(+), 19 deletions(-) rename include/clang/{AST => Analysis/Analyses}/OSLog.h (100%) rename lib/{AST => Analysis}/OSLog.cpp (99%) diff --git a/include/clang/AST/OSLog.h b/include/clang/Analysis/Analyses/OSLog.h similarity index 100% rename from include/clang/AST/OSLog.h rename to include/clang/Analysis/Analyses/OSLog.h diff --git a/lib/AST/CMakeLists.txt b/lib/AST/CMakeLists.txt index c24046c897..4f868a3af5 100644 --- a/lib/AST/CMakeLists.txt +++ b/lib/AST/CMakeLists.txt @@ -48,7 +48,6 @@ add_clang_library(clangAST NestedNameSpecifier.cpp NSAPI.cpp ODRHash.cpp - OSLog.cpp OpenMPClause.cpp ParentMap.cpp QualTypeNames.cpp diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp index a85d5cf9d5..15efe433bd 100644 --- a/lib/AST/ExprConstant.cpp +++ b/lib/AST/ExprConstant.cpp @@ -39,7 +39,6 @@ #include "clang/AST/ASTLambda.h" #include "clang/AST/CharUnits.h" #include "clang/AST/Expr.h" -#include "clang/AST/OSLog.h" #include "clang/AST/RecordLayout.h" #include "clang/AST/StmtVisitor.h" #include "clang/AST/TypeLoc.h" @@ -8127,12 +8126,6 @@ bool IntExprEvaluator::VisitBuiltinCallExpr(const CallExpr *E, llvm_unreachable("unexpected EvalMode"); } - case Builtin::BI__builtin_os_log_format_buffer_size: { - analyze_os_log::OSLogBufferLayout Layout; - analyze_os_log::computeOSLogBufferLayout(Info.Ctx, E, Layout); - return Success(Layout.size().getQuantity(), E); - } - case Builtin::BI__builtin_bswap16: case Builtin::BI__builtin_bswap32: case Builtin::BI__builtin_bswap64: { diff --git a/lib/Analysis/CMakeLists.txt b/lib/Analysis/CMakeLists.txt index 2d06e9b962..36a37f4985 100644 --- a/lib/Analysis/CMakeLists.txt +++ b/lib/Analysis/CMakeLists.txt @@ -18,6 +18,7 @@ add_clang_library(clangAnalysis ExprMutationAnalyzer.cpp FormatString.cpp LiveVariables.cpp + OSLog.cpp ObjCNoReturn.cpp PostOrderCFGView.cpp PrintfFormatString.cpp diff --git a/lib/AST/OSLog.cpp b/lib/Analysis/OSLog.cpp similarity index 99% rename from lib/AST/OSLog.cpp rename to lib/Analysis/OSLog.cpp index 7df9fa3230..b2983932ea 100644 --- a/lib/AST/OSLog.cpp +++ b/lib/Analysis/OSLog.cpp @@ -1,6 +1,6 @@ // TODO: header template -#include "clang/AST/OSLog.h" +#include "clang/Analysis/Analyses/OSLog.h" #include "clang/AST/Attr.h" #include "clang/AST/Decl.h" #include "clang/AST/DeclCXX.h" diff --git a/lib/Analysis/PrintfFormatString.cpp b/lib/Analysis/PrintfFormatString.cpp index d6f1d67bf1..dcb15c5e37 100644 --- a/lib/Analysis/PrintfFormatString.cpp +++ b/lib/Analysis/PrintfFormatString.cpp @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// #include "clang/Analysis/Analyses/FormatString.h" -#include "clang/AST/OSLog.h" +#include "clang/Analysis/Analyses/OSLog.h" #include "FormatStringParsing.h" #include "clang/Basic/TargetInfo.h" diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp index e3d2bb0b0b..c67db26711 100644 --- a/lib/CodeGen/CGBuiltin.cpp +++ b/lib/CodeGen/CGBuiltin.cpp @@ -21,7 +21,7 @@ #include "TargetInfo.h" #include "clang/AST/ASTContext.h" #include "clang/AST/Decl.h" -#include "clang/AST/OSLog.h" +#include "clang/Analysis/Analyses/OSLog.h" #include "clang/Basic/TargetBuiltins.h" #include "clang/Basic/TargetInfo.h" #include "clang/CodeGen/CGFunctionInfo.h" @@ -3609,6 +3609,13 @@ RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD, case Builtin::BI__builtin_os_log_format: return emitBuiltinOSLogFormat(*E); + case Builtin::BI__builtin_os_log_format_buffer_size: { + analyze_os_log::OSLogBufferLayout Layout; + analyze_os_log::computeOSLogBufferLayout(CGM.getContext(), E, Layout); + return RValue::get(ConstantInt::get(ConvertType(E->getType()), + Layout.size().getQuantity())); + } + case Builtin::BI__xray_customevent: { if (!ShouldXRayInstrumentFunction()) return RValue::getIgnored(); diff --git a/test/CodeGen/builtins.c b/test/CodeGen/builtins.c index 6ca3c414cf..77b479e4c1 100644 --- a/test/CodeGen/builtins.c +++ b/test/CodeGen/builtins.c @@ -729,28 +729,25 @@ void test_builtin_os_log_merge_helper1(void *buf, unsigned u, long long ll) { // CHECK-LABEL: define void @test_builtin_os_log_errno void test_builtin_os_log_errno() { - // CHECK-NOT: @stacksave - // CHECK: %[[BUF:.*]] = alloca [4 x i8], align 1 - // CHECK: %[[DECAY:.*]] = getelementptr inbounds [4 x i8], [4 x i8]* %[[BUF]], i32 0, i32 0 - // CHECK: call void @__os_log_helper_1_2_1_0_96(i8* %[[DECAY]]) - // CHECK-NOT: @stackrestore + // CHECK: %[[VLA:.*]] = alloca i8, i64 4, align 16 + // CHECK: call void @__os_log_helper_16_2_1_0_96(i8* %[[VLA]]) char buf[__builtin_os_log_format_buffer_size("%m")]; __builtin_os_log_format(buf, "%m"); } -// CHECK-LABEL: define linkonce_odr hidden void @__os_log_helper_1_2_1_0_96 +// CHECK-LABEL: define linkonce_odr hidden void @__os_log_helper_16_2_1_0_96 // CHECK: (i8* %[[BUFFER:.*]]) // CHECK: %[[BUFFER_ADDR:.*]] = alloca i8*, align 8 // CHECK: store i8* %[[BUFFER]], i8** %[[BUFFER_ADDR]], align 8 // CHECK: %[[BUF:.*]] = load i8*, i8** %[[BUFFER_ADDR]], align 8 // CHECK: %[[SUMMARY:.*]] = getelementptr i8, i8* %[[BUF]], i64 0 -// CHECK: store i8 2, i8* %[[SUMMARY]], align 1 +// CHECK: store i8 2, i8* %[[SUMMARY]], align 16 // CHECK: %[[NUMARGS:.*]] = getelementptr i8, i8* %[[BUF]], i64 1 // CHECK: store i8 1, i8* %[[NUMARGS]], align 1 // CHECK: %[[ARGDESCRIPTOR:.*]] = getelementptr i8, i8* %[[BUF]], i64 2 -// CHECK: store i8 96, i8* %[[ARGDESCRIPTOR]], align 1 +// CHECK: store i8 96, i8* %[[ARGDESCRIPTOR]], align 2 // CHECK: %[[ARGSIZE:.*]] = getelementptr i8, i8* %[[BUF]], i64 3 // CHECK: store i8 0, i8* %[[ARGSIZE]], align 1 // CHECK-NEXT: ret void -- 2.50.1