OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

jit-builtins.c: Fix segfault on unsupported builtins

Browse Source 
gcc/jit/ChangeLog:
	* jit-builtins.c
	(gcc::jit::recording::builtins_manager::get_builtin_function):
	Check for NULL return from make_builtin_function.
	(gcc::jit::recording::builtins_manager::make_builtin_function):
	Check for NULL return from get_type.

From-SVN: r218239
This commit is contained in:
David Malcolm 2014-12-01 18:16:37 +00:00 committed by David Malcolm
parent c6760a1317
commit 23844fd730
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/jit/ChangeLog
View File

@ -1,3 +1,11 @@
2014-12-01 David Malcolm <dmalcolm@redhat.com>
* jit-builtins.c
(gcc::jit::recording::builtins_manager::get_builtin_function):
Check for NULL return from make_builtin_function.
(gcc::jit::recording::builtins_manager::make_builtin_function):
Check for NULL return from get_type.
2014-12-01 David Malcolm <dmalcolm@redhat.com> 2014-12-01 David Malcolm <dmalcolm@redhat.com>
* jit-playback.c (gcc::jit::playback::context::compile): Move DSO * jit-playback.c (gcc::jit::playback::context::compile): Move DSO

13
gcc/jit/jit-builtins.c
View File

@ -160,8 +160,12 @@ builtins_manager::get_builtin_function (const char *name)
the same id on a context give back the same object. */ the same id on a context give back the same object. */
if (!m_builtin_functions[builtin_id]) if (!m_builtin_functions[builtin_id])
{ {
m_builtin_functions[builtin_id] = make_builtin_function (builtin_id); function *fn = make_builtin_function (builtin_id);
m_ctxt->record (m_builtin_functions[builtin_id]); if (fn)
{
m_builtin_functions[builtin_id] = fn;
m_ctxt->record (fn);
}
} }
return m_builtin_functions[builtin_id]; return m_builtin_functions[builtin_id];
@ -174,7 +178,10 @@ builtins_manager::make_builtin_function (enum built_in_function builtin_id)
{ {
const struct builtin_data& bd = builtin_data[builtin_id]; const struct builtin_data& bd = builtin_data[builtin_id];
enum jit_builtin_type type_id = bd.type; enum jit_builtin_type type_id = bd.type;
function_type *func_type = get_type (type_id)->as_a_function_type (); type *t = get_type (type_id);
if (!t)
return NULL;
function_type *func_type = t->as_a_function_type ();
if (!func_type) if (!func_type)
return NULL; return NULL;