Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7aa958e authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh
Browse files

Add clang-tidy.sh to filter out troublesome flags. 

* Some flags are accepted by clang but not clang-tidy.
  They could cause the diagnostic-unused-command-line-argument warning.
  Flag -flto messed up the -I flags.
* Add clang-diagnostic-unused-command-line-argument to
  default clang-tidy checks.
* Move CLANG_TIDY_UNKNOWN_CFLAGS to build/make/core/clang/tidy.mk.

Bug: 111850071
Bug: 111885396
Test: build with WITH_TIDY=1
Change-Id: Iabeeb27715acf83ef6aafe3e77206b9a01a0d889
parent 158f2d9e

cc/builder.go

+4 −2
Original line number Diff line number Diff line
@@ -150,10 +150,12 @@ var ( 
		},

		"crossCompile")



	_ = pctx.SourcePathVariable("tidyPath", "build/soong/scripts/clang-tidy.sh")



	clangTidy = pctx.AndroidStaticRule("clangTidy",

		blueprint.RuleParams{

			Command:     "rm -f $out && ${config.ClangBin}/clang-tidy $tidyFlags $in -- $cFlags && touch $out",

			CommandDeps: []string{"${config.ClangBin}/clang-tidy"},

			Command:     "rm -f $out && CLANG_TIDY=${config.ClangBin}/clang-tidy $tidyPath $tidyFlags $in -- $cFlags && touch $out",

			CommandDeps: []string{"${config.ClangBin}/clang-tidy", "$tidyPath"},

		},

		"cFlags", "tidyFlags")

cc/config/tidy.go

+2 −12
Original line number Diff line number Diff line
@@ -19,18 +19,6 @@ import ( 
	"strings"

)



// clang-tidy doesn't recognize every flag that clang does. This is unlikely to

// be a complete list, but we can populate this with the ones we know to avoid

// issues with clang-diagnostic-unused-command-line-argument.

// b/111885396: -flto affected header include directory;

// -fsanitize and -fwhole-program-vtables need -flto.

var ClangTidyUnknownCflags = sorted([]string{

	"-Wa,%",

	"-flto",

	"-fsanitize=%",

	"-fwhole-program-vtables",

})



func init() {

	// Most Android source files are not clang-tidy clean yet.

	// Global tidy checks include only google*, performance*,
@@ -42,6 +30,7 @@ func init() { 
		}

		return strings.Join([]string{

			"-*",

			"clang-diagnostic-unused-command-line-argument",

			"google*",

			"misc-macro-parentheses",

			"performance*",
@@ -58,6 +47,7 @@ func init() { 
		}

		return strings.Join([]string{

			"-*",

			"clang-diagnostic-unused-command-line-argument",

			"google*",

			"-google-build-using-namespace",

			"-google-default-arguments",

cc/makevars.go

+0 −1
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ func makeVarsProvider(ctx android.MakeVarsContext) { 
	ctx.Strict("LLVM_OBJCOPY", "${config.ClangBin}/llvm-objcopy")

	ctx.Strict("LLVM_STRIP", "${config.ClangBin}/llvm-strip")

	ctx.Strict("PATH_TO_CLANG_TIDY", "${config.ClangBin}/clang-tidy")

	ctx.Strict("CLANG_TIDY_UNKNOWN_CFLAGS", strings.Join(config.ClangTidyUnknownCflags, " "))

	ctx.StrictSorted("CLANG_CONFIG_UNKNOWN_CFLAGS", strings.Join(config.ClangUnknownCflags, " "))



	ctx.Strict("RS_LLVM_PREBUILTS_VERSION", "${config.RSClangVersion}")

scripts/clang-tidy.sh

0 → 100755
+37 −0
Original line number Diff line number Diff line 
#!/bin/bash -e



# Copyright 2018 Google Inc. All rights reserved.

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#     http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



# Wrapper script to remove clang compiler flags rejected by clang-tidy.

# Inputs:

#  Environment:

#   CLANG_TIDY: path to the real clang-tidy program



# clang-tidy doesn't recognize every flag that clang compiler does.

# It gives clang-diagnostic-unused-command-line-argument warnings

# to -Wa,* flags.

# The -flto flags caused clang-tidy to ignore the -I flags,

# see https://bugs.llvm.org/show_bug.cgi?id=38332.

# -fsanitize and -fwhole-program-vtables need -flto.

args=("${@}")

n=${#args[@]}

for ((i=0; i<$n; ++i)); do

  case ${args[i]} in

    -Wa,*|-flto|-flto=*|-fsanitize=*|-fsanitize-*|-fwhole-program-vtables)

      unset args[i]

      ;;

  esac

done

${CLANG_TIDY} "${args[@]}"