aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/call.c
diff options
context:
space:
mode:
authorMike Stump <mrs@gcc.gnu.org>1996-05-07 18:54:10 +0000
committerMike Stump <mrs@gcc.gnu.org>1996-05-07 18:54:10 +0000
commita50f0918152b332395d7f224ca5f1619cfdf52a1 (patch)
tree261e575489c1c8befbbb08b75b53209bdcb7ff76 /gcc/cp/call.c
parent637dec4188ed71b4d2e0bf04acb97b4ca19980af (diff)
downloadgcc-a50f0918152b332395d7f224ca5f1619cfdf52a1.zip
gcc-a50f0918152b332395d7f224ca5f1619cfdf52a1.tar.gz
gcc-a50f0918152b332395d7f224ca5f1619cfdf52a1.tar.bz2
86th Cygnus<->FSF quick merge
From-SVN: r11952
Diffstat (limited to 'gcc/cp/call.c')
-rw-r--r--gcc/cp/call.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 638db4c..c55d904 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -2540,18 +2540,11 @@ build_method_call (instance, name, parms, basetype_path, flags)
IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (function)));
{
- int is_constructor;
-
- if (TREE_CODE (function) == FUNCTION_DECL)
- {
- is_constructor = DECL_CONSTRUCTOR_P (function);
- function = default_conversion (function);
- }
- else
- {
- is_constructor = 0;
- function = default_conversion (function);
- }
+ int is_constructor
+ = TREE_CODE (function) == FUNCTION_DECL
+ && DECL_CONSTRUCTOR_P (function);
+
+ function = default_conversion (function);
result = build_nt (CALL_EXPR, function, parms, NULL_TREE);