Skip to content

Evaluate the arguments of a constructor call before checking the constructor in constant evaluation [GH #527, GH #494] #539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
daveedvdv-nvidia wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Evaluate the arguments of a constructor call before checking the constructor in constant evaluation [GH #527, GH #494] #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 82 additions & 74 deletions src/interpret.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25681,83 +25681,23 @@ compound statement of that handler.
goto continue_mem_inits;
} /* if */

/* Retrieve the routine scope, or issue an error. */
if (callee == NULL) {
info_with_pos(ec_constexpr_expression_cannot_be_interpreted, pos, ips);
do_constexpr_fail(result);
goto done;
} else if (!callee->is_constexpr) {
info_with_pos_sym(ec_constexpr_call_to_nonconstexpr_function,
pos, symbol_for(callee), ips);
do_constexpr_fail(result);
goto done;
} /* if */
if (!callee->defined) {
if (has_routine_definition_from_module(callee)) {
/* The definition was stored in a module file. */
if (!load_routine_definition_from_module(callee)) {
ips->input_error = TRUE;
do_constexpr_fail(result);
} /* if */
} else if ((callee->is_inheriting_ctor || callee->compiler_generated) &&
!callee->is_deleted) {
force_definition_of_compiler_generated_routine(callee);
} else {
set_instance_required(symbol_for(callee), TRUE, SIR_CONSTANT_CONTEXT);
} /* if */
} /* if */
if (callee->function_def_number == NULL_function_def_number) {
info_with_pos_sym(ec_constexpr_function_undefined, pos,
symbol_for(callee), ips);
do_constexpr_fail(result);
if (callee->is_deleted && ips->is_constant_evaluated) {
/* An error has presumably been issued earlier (use of a deleted
function). Treat this as an input error to avoid extraneous
diagnostics. */
expect_error();
ips->input_error = TRUE;
} /* if */
goto done;
} else if (callee->is_prototype_instantiation) {
info_with_pos_sym(ec_constexpr_call_not_interpretable, pos,
symbol_for(callee), ips);
do_constexpr_fail(result);
goto done;
} else if (cost_exceeded(ips)) {
report_excessive_cost(ips);
do_constexpr_fail(result);
goto done;
} else {
a_byte *result_storage = cap.address;
a_byte *complete_object = cap.complete_object;
a_scope_ptr callee_scope = scope_for_routine(callee);
a_scope_ptr callee_scope;
an_expr_node_ptr args = dip->variant.constructor.args, arg;
a_variable_ptr params = callee_scope->variant.routine.parameters,
param, this_var;
a_variable_ptr params, param, this_var;
a_base_class_ptr bcp;
a_byte_count n_args = 1, n_params = 1;
a_byte_count *arg_size;
a_byte *arg_ptrs, **p_arg_ptr, *this_bytes, *arg_sizes;
an_alloc_seq_number alloc_seq_number;
a_type_ptr class_type = parent_class_of(callee);
unsigned long up_front_cost;
/* Don't attempt to interpret a non-constexpr function. The flag
scope->is_constexpr_routine is set at the end of a constexpr function
definition, so this also prevents the interpretation of a function that
is not fully parsed (e.g., requested due to a recursive call in a
constexpr function). */
if (!callee_scope->is_constexpr_routine) {
do_constexpr_fail(result);
info_with_pos_sym(ec_constexpr_call_not_interpretable, pos,
symbol_for(callee), ips);
goto done;
} /* if */
if (class_type->variant.class_struct_union.any_virtual_base_classes) {
do_constexpr_fail(result);
info_with_pos_type(ec_constexpr_object_with_virtual_base, pos,
class_type, ips);
goto done;
} /* if */
/* Set up arguments, starting with "this" if applicable. */
/* This process must happen in two phases. First, the arguments must be
allocated and evaluated. Only then can we map parameter variables onto
Expand All @@ -25775,17 +25715,9 @@ compound statement of that handler.
result = FALSE;
goto done;
} /* if */
/* Count the parameters (including "this") to make sure there are enough
arguments for the parameters. */
for (param = params; param != NULL; param = param->next) {
n_params += 1;
} /* if */
if (n_args < n_params) {
info_with_pos(ec_too_few_arguments, pos, ips);
do_constexpr_fail(result);
goto done;
} /* if */
/* Phase 1: Allocate and evaluate the arguments. */
/* Phase 1: Allocate and evaluate the arguments. That precedes the checks
of the constructor below: If the evaluation of an argument exits by
throwing an exception, the constructor is not invoked. */
/* The "+1" below is to account for the "this" pointer (handled later). */
p_arg_ptr = (a_byte**)arg_ptrs+1;
arg_size = (a_byte_count*)arg_sizes;
Expand All @@ -25794,13 +25726,16 @@ compound statement of that handler.
/* The first non-this argument is implicit (i.e., not represented in
the IL). Since it always corresponds to the reference parameter of
a copy/move constructor, we know it is a constexpr address. */
a_type_ptr routine_type = skip_typerefs(callee->type);
a_type_ptr param_type = routine_type->variant.routine.extra_info->
param_type_list->type;
a_byte_count n_bytes = sizeof(a_constexpr_address);
a_byte *arg_bytes;
do_host_alignment(&n_bytes);
*arg_size = n_bytes;
arg_size += 1;
n_bytes += sizeof(a_var_postfix);
if (!alloc_complete_object(ips, n_bytes, params->type, arg_bytes)) {
if (!alloc_complete_object(ips, n_bytes, param_type, arg_bytes)) {
goto done;
} /* if */
*(a_constexpr_address*)arg_bytes = *implied_src;
Expand Down Expand Up @@ -25863,6 +25798,79 @@ compound statement of that handler.
goto done;
} /* if */
} /* for */
/* Check that the constructor can be interpreted, and retrieve its routine
scope. */
if (!callee->is_constexpr) {
info_with_pos_sym(ec_constexpr_call_to_nonconstexpr_function,
pos, symbol_for(callee), ips);
do_constexpr_fail(result);
goto done;
} /* if */
if (!callee->defined) {
if (has_routine_definition_from_module(callee)) {
/* The definition was stored in a module file. */
if (!load_routine_definition_from_module(callee)) {
ips->input_error = TRUE;
do_constexpr_fail(result);
} /* if */
} else if ((callee->is_inheriting_ctor || callee->compiler_generated) &&
!callee->is_deleted) {
force_definition_of_compiler_generated_routine(callee);
} else {
set_instance_required(symbol_for(callee), TRUE, SIR_CONSTANT_CONTEXT);
} /* if */
} /* if */
if (callee->function_def_number == NULL_function_def_number) {
info_with_pos_sym(ec_constexpr_function_undefined, pos,
symbol_for(callee), ips);
do_constexpr_fail(result);
if (callee->is_deleted && ips->is_constant_evaluated) {
/* An error has presumably been issued earlier (use of a deleted
function). Treat this as an input error to avoid extraneous
diagnostics. */
expect_error();
ips->input_error = TRUE;
} /* if */
goto done;
} else if (callee->is_prototype_instantiation) {
info_with_pos_sym(ec_constexpr_call_not_interpretable, pos,
symbol_for(callee), ips);
do_constexpr_fail(result);
goto done;
} else if (cost_exceeded(ips)) {
report_excessive_cost(ips);
do_constexpr_fail(result);
goto done;
} /* if */
callee_scope = scope_for_routine(callee);
params = callee_scope->variant.routine.parameters;
/* Don't attempt to interpret a non-constexpr function. The flag
scope->is_constexpr_routine is set at the end of a constexpr function
definition, so this also prevents the interpretation of a function that
is not fully parsed (e.g., requested due to a recursive call in a
constexpr function). */
if (!callee_scope->is_constexpr_routine) {
do_constexpr_fail(result);
info_with_pos_sym(ec_constexpr_call_not_interpretable, pos,
symbol_for(callee), ips);
goto done;
} /* if */
if (class_type->variant.class_struct_union.any_virtual_base_classes) {
do_constexpr_fail(result);
info_with_pos_type(ec_constexpr_object_with_virtual_base, pos,
class_type, ips);
goto done;
} /* if */
/* Count the parameters (including "this") to make sure there are enough
arguments for the parameters. */
for (param = params; param != NULL; param = param->next) {
n_params += 1;
} /* if */
if (n_args < n_params) {
info_with_pos(ec_too_few_arguments, pos, ips);
do_constexpr_fail(result);
goto done;
} /* if */
/* Phase 2: Map the parameters to the arguments. */
/* Associate with the parameter variables a new allocation number. For
ordinary calls, we just use the allocation number about to be created
Expand Down
2 changes: 1 addition & 1 deletion ...ests/imported/clang/cpp/SemaCXX/.cxx0x-initializer-stdinitializerlist.rto/default.1.1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ fe_only -DTEST_NUMBER=1 --clang -tused -e 200 --no_wrap_diagnostics --clang_vers
"Test_name.c", line 314: error: expression must have a constant value
constexpr int k = f( // expected-error {{must be initialized by a constant expression}}
^
"Test_name.c", line 317: note: cannot call non-constexpr function "TemporaryInitListSourceRange_PR22367::A::A(std::initializer_list<int>)" (declared at line 311)
"Test_name.c", line 317: note: cannot call non-constexpr function "std::initializer_list<_E>::initializer_list(const _E *, std::size_t) [with _E=int]" (declared at line 34)
std::initializer_list // expected-note {{constructor}}
^

Expand Down
2 changes: 1 addition & 1 deletion ...ests/imported/clang/cpp/SemaCXX/.cxx0x-initializer-stdinitializerlist.rto/default.2.1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ fe_only -DTEST_NUMBER=2 --clang -tused -e 200 --no_wrap_diagnostics --clang_vers
"Test_name.c", line 314: error: expression must have a constant value
constexpr int k = f( // expected-error {{must be initialized by a constant expression}}
^
"Test_name.c", line 317: note: cannot call non-constexpr function "TemporaryInitListSourceRange_PR22367::A::A(std::initializer_list<int>)" (declared at line 311)
"Test_name.c", line 317: note: cannot call non-constexpr function "std::initializer_list<_E>::initializer_list(const _E *, std::size_t) [with _E=int]" (declared at line 34)
std::initializer_list // expected-note {{constructor}}
^

Expand Down
4 changes: 2 additions & 2 deletions tests/tests/imported/clang/cpp/SemaCXX/.cxx2b-consteval-propagate.rto/default.1.1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ fe_only -DTEST_NUMBER=1 --clang -tused -e 200 --no_wrap_diagnostics --clang_vers
"Test_name.c", line 514: error: call to consteval function "GH112677::ConstEval::ConstEval(int)" did not produce a valid constant expression
TemplateCtor(int arg) : val(arg) {} // expected-note {{undefined constructor 'ConstEval'}}
^
"Test_name.c", line 514: note: constexpr function "GH112677::ConstEval::ConstEval(int)" (declared at line 508) is not defined
"Test_name.c", line 514: note: the value of parameter "arg" (declared at line 514) cannot be used as a constant
TemplateCtor(int arg) : val(arg) {} // expected-note {{undefined constructor 'ConstEval'}}
^
^
detected during implicit generation of "GH112677::C::C(int) [with Anything=int]" at line 520

"Test_name.c", line 520: error: call to consteval function "GH112677::C::C(int) [with Anything=int]" did not produce a valid constant expression
Expand Down
4 changes: 2 additions & 2 deletions tests/tests/imported/clang/cpp/SemaCXX/.cxx2b-consteval-propagate.rto/default.2.1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ fe_only -DTEST_NUMBER=2 --clang -tused -e 200 --no_wrap_diagnostics --clang_vers
"Test_name.c", line 514: error: call to consteval function "GH112677::ConstEval::ConstEval(int)" did not produce a valid constant expression
TemplateCtor(int arg) : val(arg) {} // expected-note {{undefined constructor 'ConstEval'}}
^
"Test_name.c", line 514: note: constexpr function "GH112677::ConstEval::ConstEval(int)" (declared at line 508) is not defined
"Test_name.c", line 514: note: the value of parameter "arg" (declared at line 514) cannot be used as a constant
TemplateCtor(int arg) : val(arg) {} // expected-note {{undefined constructor 'ConstEval'}}
^
^
detected during implicit generation of "GH112677::C::C(int) [with Anything=int]" at line 520

"Test_name.c", line 520: error: call to consteval function "GH112677::C::C(int) [with Anything=int]" did not produce a valid constant expression
Expand Down
4 changes: 2 additions & 2 deletions tests/tests/imported/clang/cpp/SemaCXX/.cxx2b-consteval-propagate.rto/default.3.1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,9 @@ fe_only -DTEST_NUMBER=3 --clang -tused -e 200 --no_wrap_diagnostics --clang_vers
"Test_name.c", line 514: error: call to consteval function "GH112677::ConstEval::ConstEval(int)" did not produce a valid constant expression
TemplateCtor(int arg) : val(arg) {} // expected-note {{undefined constructor 'ConstEval'}}
^
"Test_name.c", line 514: note: constexpr function "GH112677::ConstEval::ConstEval(int)" (declared at line 508) is not defined
"Test_name.c", line 514: note: the value of parameter "arg" (declared at line 514) cannot be used as a constant
TemplateCtor(int arg) : val(arg) {} // expected-note {{undefined constructor 'ConstEval'}}
^
^
detected during implicit generation of "GH112677::C::C(int) [with Anything=int]" at line 520

"Test_name.c", line 520: error: call to consteval function "GH112677::C::C(int) [with Anything=int]" did not produce a valid constant expression
Expand Down
4 changes: 2 additions & 2 deletions tests/tests/imported/clang/cpp/SemaCXX/.cxx2b-consteval-propagate.rto/default.4.1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,9 @@ fe_only -DTEST_NUMBER=4 --clang -tused -e 200 --no_wrap_diagnostics --clang_vers
"Test_name.c", line 514: error: call to consteval function "GH112677::ConstEval::ConstEval(int)" did not produce a valid constant expression
TemplateCtor(int arg) : val(arg) {} // expected-note {{undefined constructor 'ConstEval'}}
^
"Test_name.c", line 514: note: constexpr function "GH112677::ConstEval::ConstEval(int)" (declared at line 508) is not defined
"Test_name.c", line 514: note: the value of parameter "arg" (declared at line 514) cannot be used as a constant
TemplateCtor(int arg) : val(arg) {} // expected-note {{undefined constructor 'ConstEval'}}
^
^
detected during implicit generation of "GH112677::C::C(int) [with Anything=int]" at line 520

"Test_name.c", line 520: error: call to consteval function "GH112677::C::C(int) [with Anything=int]" did not produce a valid constant expression
Expand Down
4 changes: 2 additions & 2 deletions tests/tests/imported/clang/cpp/SemaCXX/.cxx2b-consteval-propagate.rto/edg_x86_32_cp.1.1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ fe_only -DTEST_NUMBER=1 --clang -tused -e 200 --no_wrap_diagnostics --clang_vers
"Test_name.c", line 514: error: call to consteval function "GH112677::ConstEval::ConstEval(int)" did not produce a valid constant expression
TemplateCtor(int arg) : val(arg) {} // expected-note {{undefined constructor 'ConstEval'}}
^
"Test_name.c", line 514: note: constexpr function "GH112677::ConstEval::ConstEval(int)" (declared at line 508) is not defined
"Test_name.c", line 514: note: the value of parameter "arg" (declared at line 514) cannot be used as a constant
TemplateCtor(int arg) : val(arg) {} // expected-note {{undefined constructor 'ConstEval'}}
^
^

"Test_name.c", line 520: error: call to consteval function "GH112677::C::C(int) [with Anything=int]" did not produce a valid constant expression
C c(0); // expected-note{{in implicit initialization for inherited constructor of 'C'}}
Expand Down
4 changes: 2 additions & 2 deletions tests/tests/imported/clang/cpp/SemaCXX/.cxx2b-consteval-propagate.rto/edg_x86_32_cp.2.1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ fe_only -DTEST_NUMBER=2 --clang -tused -e 200 --no_wrap_diagnostics --clang_vers
"Test_name.c", line 514: error: call to consteval function "GH112677::ConstEval::ConstEval(int)" did not produce a valid constant expression
TemplateCtor(int arg) : val(arg) {} // expected-note {{undefined constructor 'ConstEval'}}
^
"Test_name.c", line 514: note: constexpr function "GH112677::ConstEval::ConstEval(int)" (declared at line 508) is not defined
"Test_name.c", line 514: note: the value of parameter "arg" (declared at line 514) cannot be used as a constant
TemplateCtor(int arg) : val(arg) {} // expected-note {{undefined constructor 'ConstEval'}}
^
^

"Test_name.c", line 520: error: call to consteval function "GH112677::C::C(int) [with Anything=int]" did not produce a valid constant expression
C c(0); // expected-note{{in implicit initialization for inherited constructor of 'C'}}
Expand Down
4 changes: 2 additions & 2 deletions tests/tests/imported/clang/cpp/SemaCXX/.cxx2b-consteval-propagate.rto/edg_x86_32_cp.3.1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,9 @@ fe_only -DTEST_NUMBER=3 --clang -tused -e 200 --no_wrap_diagnostics --clang_vers
"Test_name.c", line 514: error: call to consteval function "GH112677::ConstEval::ConstEval(int)" did not produce a valid constant expression
TemplateCtor(int arg) : val(arg) {} // expected-note {{undefined constructor 'ConstEval'}}
^
"Test_name.c", line 514: note: constexpr function "GH112677::ConstEval::ConstEval(int)" (declared at line 508) is not defined
"Test_name.c", line 514: note: the value of parameter "arg" (declared at line 514) cannot be used as a constant
TemplateCtor(int arg) : val(arg) {} // expected-note {{undefined constructor 'ConstEval'}}
^
^

"Test_name.c", line 520: error: call to consteval function "GH112677::C::C(int) [with Anything=int]" did not produce a valid constant expression
C c(0); // expected-note{{in implicit initialization for inherited constructor of 'C'}}
Expand Down
4 changes: 2 additions & 2 deletions tests/tests/imported/clang/cpp/SemaCXX/.cxx2b-consteval-propagate.rto/edg_x86_32_cp.4.1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,9 @@ fe_only -DTEST_NUMBER=4 --clang -tused -e 200 --no_wrap_diagnostics --clang_vers
"Test_name.c", line 514: error: call to consteval function "GH112677::ConstEval::ConstEval(int)" did not produce a valid constant expression
TemplateCtor(int arg) : val(arg) {} // expected-note {{undefined constructor 'ConstEval'}}
^
"Test_name.c", line 514: note: constexpr function "GH112677::ConstEval::ConstEval(int)" (declared at line 508) is not defined
"Test_name.c", line 514: note: the value of parameter "arg" (declared at line 514) cannot be used as a constant
TemplateCtor(int arg) : val(arg) {} // expected-note {{undefined constructor 'ConstEval'}}
^
^

"Test_name.c", line 520: error: call to consteval function "GH112677::C::C(int) [with Anything=int]" did not produce a valid constant expression
C c(0); // expected-note{{in implicit initialization for inherited constructor of 'C'}}
Expand Down
4 changes: 2 additions & 2 deletions tests/tests/imported/clang/cpp/SemaCXX/.cxx2b-consteval-propagate.rto/edg_x86_64_cp.1.1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ fe_only -DTEST_NUMBER=1 --clang -tused -e 200 --no_wrap_diagnostics --clang_vers
"Test_name.c", line 514: error: call to consteval function "GH112677::ConstEval::ConstEval(int)" did not produce a valid constant expression
TemplateCtor(int arg) : val(arg) {} // expected-note {{undefined constructor 'ConstEval'}}
^
"Test_name.c", line 514: note: constexpr function "GH112677::ConstEval::ConstEval(int)" (declared at line 508) is not defined
"Test_name.c", line 514: note: the value of parameter "arg" (declared at line 514) cannot be used as a constant
TemplateCtor(int arg) : val(arg) {} // expected-note {{undefined constructor 'ConstEval'}}
^
^

"Test_name.c", line 520: error: call to consteval function "GH112677::C::C(int) [with Anything=int]" did not produce a valid constant expression
C c(0); // expected-note{{in implicit initialization for inherited constructor of 'C'}}
Expand Down
Loading
Loading