Fix externalization in command line macros, IBT tests

This commit fixes a weird case where the SymbolExternalizer attempts
to rewrite a macro that was defined in the command line.

This also fixes the first IBT testcase, as well as add new ones that
are currently failing so we mark them as XFAIL.

linux tests are now in testsuite/linux.

Signed-off-by: Giuliano Belinassi <[email protected]>

libcextract/SymbolExternalizer.cpp

@@ -326,6 +326,19 @@ void TextModifications::Commit(void)
 
     /* Insert into the list of FileIDs.  */
     const FileEntry *fentry = SM.getFileEntryForID(begin_id);
+
+    /* There are some cases where the fentry is known to return NULL.  Check if
+       those are the cases we already acknownledged.  */
+    if (fentry == nullptr) {
+      PresumedLoc ploc = SM.getPresumedLoc(a.ToChange.getBegin());
+      if (ploc.getFilename() == StringRef("<command line>")) {
+        /* Locations comming from the command line can be ignored.  */
+        continue;
+      }
+
+      /* Crash with assertion.  */
+      assert(fentry && "FileEntry is NULL on a non-acknowledged case");
+    }
     /* Insert the FileEntry if we don't have one.  */
     if (FileEntryMap.find(fentry) == FileEntryMap.end()) {
       /* Insert it.  */
@@ -927,7 +940,7 @@ void SymbolExternalizer::Externalize_Symbols(std::vector<std::string> const &to_
     FileID fi = sm.getMainFileID();
     SourceLocation sl = sm.getLocForStartOfFile(fi);
     SourceRange sr(sl, sl);
-    Insert_Text(sr, "#include <linux/livepatch.h>", 1000);
+    Insert_Text(sr, "#include <linux/livepatch.h>\n", 1000);
   }
 
   for (const std::string &to_externalize : to_externalize_array) {

testsuite/linux/ibt-1.c

@@ -0,0 +1,19 @@
+/* { dg-options "-DCE_EXTRACT_FUNCTIONS=f -DCE_SYMVERS_PATH=../testsuite/linux/Modules.symvers -DCE_RENAME_SYMBOLS -nostdinc -I../testsuite/linux -DKBUILD_MODNAME=crc32c -D__USE_IBT__ -D__KERNEL__ -DCE_KEEP_INCLUDES" } */
+
+typedef unsigned int u32;
+
+u32 crc32c(u32 crc, const void *address, unsigned int length);
+
+int f(void)
+{
+	u32 lcrc = 0;
+	void *addr = 0;
+	unsigned int len = 0;
+
+	(void)crc32c(lcrc, addr, len);
+	return 0;
+}
+
+/* { dg-final { scan-tree-dump "u32 klpe_crc32c|u32 \(klpe_crc32c\)" } } */
+/* { dg-final { scan-tree-dump "KLP_RELOC_SYMBOL\(crc32c, libcrc32c, crc32c\)" } } */
+/* { dg-final { scan-tree-dump-not "\(\*klpe_crc32c\)" } } */

testsuite/linux/ibt-2.c

@@ -0,0 +1,23 @@
+/* { dg-options "-DCE_EXTRACT_FUNCTIONS=f -DCE_SYMVERS_PATH=../testsuite/linux/Modules.symvers -DCE_RENAME_SYMBOLS -nostdinc -I../testsuite/linux -DKBUILD_MODNAME=crc32c -D__USE_IBT__ -D__KERNEL__ -DCE_KEEP_INCLUDES" } */
+
+/* Check why the include is not being output.  */
+/* { dg-xfail }*/
+
+typedef unsigned int u32;
+
+u32 crc32c(u32 crc, const void *address, unsigned int length);
+
+int f(void)
+{
+	u32 lcrc = 0;
+	void *addr = 0;
+	unsigned int len = 0;
+
+	(void)crc32c(lcrc, addr, len);
+	return 0;
+}
+
+/* { dg-final { scan-tree-dump "#include <linux/livepatch.h>" } } */
+/* { dg-final { scan-tree-dump "u32 klpe_crc32c|u32 \(klpe_crc32c\)" } } */
+/* { dg-final { scan-tree-dump "KLP_RELOC_SYMBOL\(crc32c, libcrc32c, crc32c\)" } } */
+/* { dg-final { scan-tree-dump-not "\(\*klpe_crc32c\)" } } */

testsuite/linux/ibt-3.c

@@ -0,0 +1,22 @@
+/* { dg-options "-DCE_EXTRACT_FUNCTIONS=f -DCE_SYMVERS_PATH=../testsuite/linux/Modules.symvers -DCE_RENAME_SYMBOLS -nostdinc -I../testsuite/linux -DKBUILD_MODNAME=crc32c -D__USE_IBT__ -D__KERNEL__ -DCE_KEEP_INCLUDES" } */
+/* { dg-xfail } */
+
+/* Check why parenthesis are being output in the redeclaration.  */
+
+typedef unsigned int u32;
+
+u32 crc32c(u32 crc, const void *address, unsigned int length);
+
+int f(void)
+{
+	u32 lcrc = 0;
+	void *addr = 0;
+	unsigned int len = 0;
+
+	(void)crc32c(lcrc, addr, len);
+	return 0;
+}
+
+/* { dg-final { scan-tree-dump "u32 klpe_crc32c" } } */
+/* { dg-final { scan-tree-dump "KLP_RELOC_SYMBOL\(crc32c, libcrc32c, crc32c\)" } } */
+/* { dg-final { scan-tree-dump-not "\(\*klpe_crc32c\)" } } */

testsuite/meson.build

@@ -14,7 +14,7 @@
 # Author: Giuliano Belinassi
 
 runtest = find_program('lib/runtest.py')
-ordinary_test_dirs = [ 'small/', 'includes/', 'ccp/' ]
+ordinary_test_dirs = [ 'small/', 'includes/', 'ccp/', 'linux' ]
 
 returncode_to_bool = [ true, false ]