Merge branch 'llvm:main' into main

Author: martinlicht

bolt/test/indirect-goto-relocs.test

@@ -4,16 +4,7 @@
 RUN: %clang %cflags -pie %S/Inputs/indirect_goto.c -o %t.exe -Wl,-q
 RUN: llvm-bolt %t.exe -o %t.bolt --print-cfg | FileCheck --check-prefix=CHECK-PIE %s
 
-RUN: %clang %cflags -no-pie %S/Inputs/indirect_goto.c -o %t.exe -Wl,-q
-RUN: llvm-bolt %t.exe -o %t.bolt --print-cfg | FileCheck --check-prefix=CHECK-NO-PIE %s
-
 // Check that BOLT registers extra entry points for dynamic relocations with PIE.
 CHECK-PIE: Binary Function "main" after building cfg {
 CHECK-PIE: IsMultiEntry: 1
 CHECK-PIE: Secondary Entry Points : {{.*}}
-
-// Check that BOLT does not register extra entry points for dynamic relocations
-// without PIE
-CHECK-NO-PIE: Binary Function "main" after building cfg {
-CHECK-NO-PIE-NOT: IsMultiEntry: 1
-CHECK-NO-PIE-NOT: Secondary Entry Points : {{.*}}

clang-tools-extra/modularize/ModularizeUtilities.cpp

@@ -290,7 +290,7 @@ std::error_code ModularizeUtilities::loadModuleMap(
     Target.get(), *HeaderInfo));
 
   // Parse module.modulemap file into module map.
-  if (ModMap->parseModuleMapFile(ModuleMapEntry, false, Dir)) {
+  if (ModMap->loadModuleMapFile(ModuleMapEntry, false, Dir)) {
     return std::error_code(1, std::generic_category());
   }
 

clang-tools-extra/modularize/ModuleAssistant.cpp

@@ -129,8 +129,8 @@ Module *Module::findSubModule(llvm::StringRef SubName) {
 // Implementation functions:
 
 // Reserved keywords in module.modulemap syntax.
-// Keep in sync with keywords in module map parser in Lex/ModuleMap.cpp,
-// such as in ModuleMapParser::consumeToken().
+// Keep in sync with keywords in module map parser in Lex/ModuleMapFile.cpp,
+// such as in ModuleMapFileParser::consumeToken().
 static const char *const ReservedNames[] = {
   "config_macros", "export",   "module", "conflict", "framework",
   "requires",      "exclude",  "header", "private",  "explicit",

clang/bindings/python/clang/cindex.py

@@ -2802,7 +2802,7 @@ class _CXUnsavedFile(Structure):
 # Functions calls through the python interface are rather slow. Fortunately,
 # for most symboles, we do not need to perform a function call. Their spelling
 # never changes and is consequently provided by this spelling cache.
-spelling_cache = {
+SPELLING_CACHE = {
     # 0: CompletionChunk.Kind("Optional"),
     # 1: CompletionChunk.Kind("TypedText"),
     # 2: CompletionChunk.Kind("Text"),
@@ -2848,8 +2848,8 @@ def __repr__(self):
 
     @CachedProperty
     def spelling(self):
-        if self.__kindNumber in spelling_cache:
-            return spelling_cache[self.__kindNumber]
+        if self.__kindNumber in SPELLING_CACHE:
+            return SPELLING_CACHE[self.__kindNumber]
         return _CXString.from_result(
             conf.lib.clang_getCompletionChunkText(self.cs, self.key)
         )
@@ -3846,7 +3846,7 @@ def set_property(self, property, value):
 fields_visit_callback = CFUNCTYPE(c_int, Cursor, py_object)
 
 # Functions strictly alphabetical order.
-function_list: list[LibFunc] = [
+FUNCTION_LIST: list[LibFunc] = [
     (
         "clang_annotateTokens",
         [TranslationUnit, POINTER(Token), c_uint, POINTER(Cursor)],
@@ -4125,7 +4125,7 @@ def register_functions(lib: CDLL, ignore_errors: bool) -> None:
     def register(item: LibFunc) -> None:
         register_function(lib, item, ignore_errors)
 
-    for f in function_list:
+    for f in FUNCTION_LIST:
         register(f)
 
 

clang/bindings/python/tests/cindex/test_cdb.py

@@ -10,7 +10,7 @@
 import sys
 from pathlib import Path
 
-inputs_dir = os.path.join(os.path.dirname(__file__), "INPUTS")
+INPUTS_DIR = os.path.join(os.path.dirname(__file__), "INPUTS")
 
 
 @unittest.skipIf(sys.platform == "win32", "TODO: Fix these tests on Windows")
@@ -34,23 +34,23 @@ def test_create_fail(self):
 
     def test_create(self):
         """Check we can load a compilation database"""
-        CompilationDatabase.fromDirectory(inputs_dir)
+        CompilationDatabase.fromDirectory(INPUTS_DIR)
 
     def test_lookup_succeed(self):
         """Check we get some results if the file exists in the db"""
-        cdb = CompilationDatabase.fromDirectory(inputs_dir)
+        cdb = CompilationDatabase.fromDirectory(INPUTS_DIR)
         cmds = cdb.getCompileCommands("/home/john.doe/MyProject/project.cpp")
         self.assertNotEqual(len(cmds), 0)
 
     def test_lookup_succeed_pathlike(self):
         """Same as test_lookup_succeed, but with PathLikes"""
-        cdb = CompilationDatabase.fromDirectory(Path(inputs_dir))
+        cdb = CompilationDatabase.fromDirectory(Path(INPUTS_DIR))
         cmds = cdb.getCompileCommands(Path("/home/john.doe/MyProject/project.cpp"))
         self.assertNotEqual(len(cmds), 0)
 
     def test_all_compilecommand(self):
         """Check we get all results from the db"""
-        cdb = CompilationDatabase.fromDirectory(inputs_dir)
+        cdb = CompilationDatabase.fromDirectory(INPUTS_DIR)
         cmds = cdb.getAllCompileCommands()
         self.assertEqual(len(cmds), 3)
         expected = [
@@ -100,7 +100,7 @@ def test_all_compilecommand(self):
 
     def test_1_compilecommand(self):
         """Check file with single compile command"""
-        cdb = CompilationDatabase.fromDirectory(inputs_dir)
+        cdb = CompilationDatabase.fromDirectory(INPUTS_DIR)
         file = "/home/john.doe/MyProject/project.cpp"
         cmds = cdb.getCompileCommands(file)
         self.assertEqual(len(cmds), 1)
@@ -119,7 +119,7 @@ def test_1_compilecommand(self):
 
     def test_2_compilecommand(self):
         """Check file with 2 compile commands"""
-        cdb = CompilationDatabase.fromDirectory(inputs_dir)
+        cdb = CompilationDatabase.fromDirectory(INPUTS_DIR)
         cmds = cdb.getCompileCommands("/home/john.doe/MyProject/project2.cpp")
         self.assertEqual(len(cmds), 2)
         expected = [
@@ -154,23 +154,23 @@ def test_2_compilecommand(self):
 
     def test_compilecommand_iterator_stops(self):
         """Check that iterator stops after the correct number of elements"""
-        cdb = CompilationDatabase.fromDirectory(inputs_dir)
+        cdb = CompilationDatabase.fromDirectory(INPUTS_DIR)
         count = 0
         for cmd in cdb.getCompileCommands("/home/john.doe/MyProject/project2.cpp"):
             count += 1
             self.assertLessEqual(count, 2)
 
     def test_compilationDB_references(self):
         """Ensure CompilationsCommands are independent of the database"""
-        cdb = CompilationDatabase.fromDirectory(inputs_dir)
+        cdb = CompilationDatabase.fromDirectory(INPUTS_DIR)
         cmds = cdb.getCompileCommands("/home/john.doe/MyProject/project.cpp")
         del cdb
         gc.collect()
         cmds[0].directory
 
     def test_compilationCommands_references(self):
         """Ensure CompilationsCommand keeps a reference to CompilationCommands"""
-        cdb = CompilationDatabase.fromDirectory(inputs_dir)
+        cdb = CompilationDatabase.fromDirectory(INPUTS_DIR)
         cmds = cdb.getCompileCommands("/home/john.doe/MyProject/project.cpp")
         del cdb
         cmd0 = cmds[0]

clang/bindings/python/tests/cindex/test_cursor.py

@@ -22,7 +22,7 @@
 
 from .util import get_cursor, get_cursors, get_tu
 
-children_test = """\
+CHILDREN_TEST = """\
 struct s0 {
   int a;
   int b;
@@ -42,23 +42,23 @@
 }
 """
 
-parent_test = """\
+PARENT_TEST = """\
         class C {
             void f();
         }
 
         void C::f() { }
     """
 
-template_arg_test = """\
+TEMPLATE_ARG_TEST = """\
         template <int kInt, typename T, bool kBool>
         void foo();
 
         template<>
         void foo<-7, float, true>();
     """
 
-binops = """\
+BINOPS = """\
 struct C {
    int m;
  };
@@ -119,7 +119,7 @@ class C {
 
 class TestCursor(unittest.TestCase):
     def test_get_children(self):
-        tu = get_tu(children_test)
+        tu = get_tu(CHILDREN_TEST)
 
         it = tu.cursor.get_children()
         tu_nodes = list(it)
@@ -614,15 +614,15 @@ def test_underlying_type(self):
         self.assertEqual(underlying.kind, TypeKind.INT)
 
     def test_semantic_parent(self):
-        tu = get_tu(parent_test, "cpp")
+        tu = get_tu(PARENT_TEST, "cpp")
         curs = get_cursors(tu, "f")
         decl = get_cursor(tu, "C")
         self.assertEqual(len(curs), 2)
         self.assertEqual(curs[0].semantic_parent, curs[1].semantic_parent)
         self.assertEqual(curs[0].semantic_parent, decl)
 
     def test_lexical_parent(self):
-        tu = get_tu(parent_test, "cpp")
+        tu = get_tu(PARENT_TEST, "cpp")
         curs = get_cursors(tu, "f")
         decl = get_cursor(tu, "C")
         self.assertEqual(len(curs), 2)
@@ -866,13 +866,13 @@ def test_get_arguments(self):
         self.assertEqual(arguments[1].spelling, "j")
 
     def test_get_num_template_arguments(self):
-        tu = get_tu(template_arg_test, lang="cpp")
+        tu = get_tu(TEMPLATE_ARG_TEST, lang="cpp")
         foos = get_cursors(tu, "foo")
 
         self.assertEqual(foos[1].get_num_template_arguments(), 3)
 
     def test_get_template_argument_kind(self):
-        tu = get_tu(template_arg_test, lang="cpp")
+        tu = get_tu(TEMPLATE_ARG_TEST, lang="cpp")
         foos = get_cursors(tu, "foo")
 
         self.assertEqual(
@@ -886,20 +886,20 @@ def test_get_template_argument_kind(self):
         )
 
     def test_get_template_argument_type(self):
-        tu = get_tu(template_arg_test, lang="cpp")
+        tu = get_tu(TEMPLATE_ARG_TEST, lang="cpp")
         foos = get_cursors(tu, "foo")
 
         self.assertEqual(foos[1].get_template_argument_type(1).kind, TypeKind.FLOAT)
 
     def test_get_template_argument_value(self):
-        tu = get_tu(template_arg_test, lang="cpp")
+        tu = get_tu(TEMPLATE_ARG_TEST, lang="cpp")
         foos = get_cursors(tu, "foo")
 
         self.assertEqual(foos[1].get_template_argument_value(0), -7)
         self.assertEqual(foos[1].get_template_argument_value(2), True)
 
     def test_get_template_argument_unsigned_value(self):
-        tu = get_tu(template_arg_test, lang="cpp")
+        tu = get_tu(TEMPLATE_ARG_TEST, lang="cpp")
         foos = get_cursors(tu, "foo")
 
         self.assertEqual(foos[1].get_template_argument_unsigned_value(0), 2**32 - 7)
@@ -931,7 +931,7 @@ def test_mangled_name(self):
         )
 
     def test_binop(self):
-        tu = get_tu(binops, lang="cpp")
+        tu = get_tu(BINOPS, lang="cpp")
 
         operators = {
             # not exposed yet
@@ -1004,7 +1004,7 @@ def accumulate_cursors(cursor: Cursor, all_cursors: list):
                 all_cursors = accumulate_cursors(child, all_cursors)
             return all_cursors
 
-        tu = get_tu(children_test)
+        tu = get_tu(CHILDREN_TEST)
         all_cursors = accumulate_cursors(tu.cursor, [])
         cursor_hashes = set()
         for cursor in all_cursors:
@@ -1028,7 +1028,7 @@ def test_has_attrs(self):
         self.assertFalse(B.get_definition().has_attrs())
 
     def test_specialized_template(self):
-        tu = get_tu(template_arg_test, lang="cpp")
+        tu = get_tu(TEMPLATE_ARG_TEST, lang="cpp")
         foos = get_cursors(tu, "foo")
         prime_foo = foos[1].specialized_template
 

clang/bindings/python/tests/cindex/test_index.py

@@ -7,7 +7,7 @@
 
 import unittest
 
-inputs_dir = os.path.join(os.path.dirname(__file__), "INPUTS")
+INPUTS_DIR = os.path.join(os.path.dirname(__file__), "INPUTS")
 
 
 class TestIndex(unittest.TestCase):
@@ -19,7 +19,7 @@ def test_create(self):
     def test_parse(self):
         index = Index.create()
         self.assertIsInstance(index, Index)
-        tu = index.parse(os.path.join(inputs_dir, "hello.cpp"))
+        tu = index.parse(os.path.join(INPUTS_DIR, "hello.cpp"))
         self.assertIsInstance(tu, TranslationUnit)
-        tu = index.parse(None, ["-c", os.path.join(inputs_dir, "hello.cpp")])
+        tu = index.parse(None, ["-c", os.path.join(INPUTS_DIR, "hello.cpp")])
         self.assertIsInstance(tu, TranslationUnit)

clang/bindings/python/tests/cindex/test_location.py

@@ -16,7 +16,7 @@
 
 from .util import get_cursor, get_tu
 
-base_input = "int one;\nint two;\n"
+BASE_INPUT = "int one;\nint two;\n"
 
 
 class TestLocation(unittest.TestCase):
@@ -26,7 +26,7 @@ def assert_location(self, loc, line, column, offset):
         self.assertEqual(loc.offset, offset)
 
     def test_location(self):
-        tu = get_tu(base_input)
+        tu = get_tu(BASE_INPUT)
         one = get_cursor(tu, "one")
         two = get_cursor(tu, "two")
 
@@ -37,7 +37,7 @@ def test_location(self):
         self.assert_location(two.location, line=2, column=5, offset=13)
 
         # adding a linebreak at top should keep columns same
-        tu = get_tu("\n" + base_input)
+        tu = get_tu("\n" + BASE_INPUT)
         one = get_cursor(tu, "one")
         two = get_cursor(tu, "two")
 
@@ -48,7 +48,7 @@ def test_location(self):
         self.assert_location(two.location, line=3, column=5, offset=14)
 
         # adding a space should affect column on first line only
-        tu = get_tu(" " + base_input)
+        tu = get_tu(" " + BASE_INPUT)
         one = get_cursor(tu, "one")
         two = get_cursor(tu, "two")
 
@@ -57,7 +57,7 @@ def test_location(self):
 
         # define the expected location ourselves and see if it matches
         # the returned location
-        tu = get_tu(base_input)
+        tu = get_tu(BASE_INPUT)
 
         file = File.from_name(tu, "t.c")
         location = SourceLocation.from_position(tu, file, 1, 5)
@@ -83,20 +83,20 @@ def test_location(self):
         self.assertTrue(verified)
 
     def test_extent(self):
-        tu = get_tu(base_input)
+        tu = get_tu(BASE_INPUT)
         one = get_cursor(tu, "one")
         two = get_cursor(tu, "two")
 
         self.assert_location(one.extent.start, line=1, column=1, offset=0)
         self.assert_location(one.extent.end, line=1, column=8, offset=7)
         self.assertEqual(
-            base_input[one.extent.start.offset : one.extent.end.offset], "int one"
+            BASE_INPUT[one.extent.start.offset : one.extent.end.offset], "int one"
         )
 
         self.assert_location(two.extent.start, line=2, column=1, offset=9)
         self.assert_location(two.extent.end, line=2, column=8, offset=16)
         self.assertEqual(
-            base_input[two.extent.start.offset : two.extent.end.offset], "int two"
+            BASE_INPUT[two.extent.start.offset : two.extent.end.offset], "int two"
         )
 
         file = File.from_name(tu, "t.c")