libgccjit: Fix for -fanalyzer used in libgccjit

antoyo · antoyo · commit 038c30d0d939 · 2025-01-20T14:22:41.000-05:00
diff --git a/gcc/analyzer/checker-event.h b/gcc/analyzer/checker-event.h
@@ -565,6 +565,8 @@ class inlined_call_event : public checker_event
     m_apparent_callee_fndecl (apparent_callee_fndecl),
     m_apparent_caller_fndecl (apparent_caller_fndecl)
   {
+    gcc_assert (apparent_callee_fndecl != NULL);
+    gcc_assert (apparent_caller_fndecl != NULL);
     gcc_assert (LOCATION_BLOCK (loc) == NULL);
   }
 
diff --git a/gcc/jit/jit-playback.cc b/gcc/jit/jit-playback.cc
@@ -2186,6 +2186,7 @@ function (context *ctxt,
       m_stmt_list = alloc_stmt_list ();
       m_stmt_iter = tsi_start (m_stmt_list);
       m_inner_block = make_node (BLOCK);
+      BLOCK_SUPERCONTEXT (m_inner_block) = m_inner_fndecl;
       m_inner_bind_expr =
 	build3 (BIND_EXPR, void_type_node, NULL, m_stmt_list, m_inner_block);
     }

Original file line number	Diff line number	Diff line change
`@@ -565,6 +565,8 @@ class inlined_call_event : public checker_event`
`565`	`565`	`m_apparent_callee_fndecl (apparent_callee_fndecl),`
`566`	`566`	`m_apparent_caller_fndecl (apparent_caller_fndecl)`
`567`	`567`	`{`
	`568`	`+ gcc_assert (apparent_callee_fndecl != NULL);`
	`569`	`+ gcc_assert (apparent_caller_fndecl != NULL);`
`568`	`570`	`gcc_assert (LOCATION_BLOCK (loc) == NULL);`
`569`	`571`	`}`
`570`	`572`
Original file line number	Diff line number	Diff line change
`@@ -2186,6 +2186,7 @@ function (context *ctxt,`
`2186`	`2186`	`m_stmt_list = alloc_stmt_list ();`
`2187`	`2187`	`m_stmt_iter = tsi_start (m_stmt_list);`
`2188`	`2188`	`m_inner_block = make_node (BLOCK);`
	`2189`	`+ BLOCK_SUPERCONTEXT (m_inner_block) = m_inner_fndecl;`
`2189`	`2190`	`m_inner_bind_expr =`
`2190`	`2191`	`build3 (BIND_EXPR, void_type_node, NULL, m_stmt_list, m_inner_block);`
`2191`	`2192`	`}`