projects/ldc: dmd2/inline.c annotate

annotate dmd2/inline.c @ 1638:0de4525a9ed6

Apply workaround for #395 by klickverbot.

author	Christian Kamm <kamm incasoftware de>
date	Mon, 08 Mar 2010 20:06:08 +0100
parents	e4f7b5d9c68a
children

rev	line source
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1
1577 e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	2 // Copyright (c) 1999-2009 by Digital Mars
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3 // All Rights Reserved
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4 // written by Walter Bright
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5 // http://www.digitalmars.com
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	6 // License for redistribution is by either the Artistic License
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	7 // in artistic.txt, or the GNU General Public License in gnu.txt.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	8 // See the included readme.txt for details.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	9
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	10 // Routines to perform function inlining
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	11
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	12 #define LOG 0
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	13
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	14 #include <stdio.h>
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	15 #include <stdlib.h>
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	16 #include <assert.h>
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	17
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	18 #include "id.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	19 #include "init.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	20 #include "declaration.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	21 #include "aggregate.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	22 #include "expression.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	23 #include "statement.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	24 #include "mtype.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	25
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	26 /* ========== Compute cost of inlining =============== */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	27
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	28 /* Walk trees to determine if inlining can be done, and if so,
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	29 * if it is too complex to be worth inlining or not.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	30 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	31
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	32 struct InlineCostState
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	33 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	34 int nested;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	35 int hasthis;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	36 int hdrscan; // !=0 if inline scan for 'header' content
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	37 FuncDeclaration *fd;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	38 };
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	39
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	40 const int COST_MAX = 250;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	41
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	42 int Statement::inlineCost(InlineCostState *ics)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	43 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	44 return COST_MAX; // default is we can't inline it
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	45 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	46
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	47 int ExpStatement::inlineCost(InlineCostState *ics)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	48 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	49 return exp ? exp->inlineCost(ics) : 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	50 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	51
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	52 int CompoundStatement::inlineCost(InlineCostState *ics)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	53 { int cost = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	54
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	55 for (size_t i = 0; i < statements->dim; i++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	56 { Statement s = (Statement ) statements->data[i];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	57 if (s)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	58 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	59 cost += s->inlineCost(ics);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	60 if (cost >= COST_MAX)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	61 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	62 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	63 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	64 return cost;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	65 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	66
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	67 int UnrolledLoopStatement::inlineCost(InlineCostState *ics)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	68 { int cost = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	69
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	70 for (size_t i = 0; i < statements->dim; i++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	71 { Statement s = (Statement ) statements->data[i];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	72 if (s)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	73 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	74 cost += s->inlineCost(ics);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	75 if (cost >= COST_MAX)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	76 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	77 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	78 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	79 return cost;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	80 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	81
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	82 int IfStatement::inlineCost(InlineCostState *ics)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	83 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	84 int cost;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	85
1487 f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	86 #if !IN_LLVM
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	87 /* Can't declare variables inside ?: expressions, so
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	88 * we cannot inline if a variable is declared.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	89 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	90 if (arg)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	91 return COST_MAX;
1487 f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	92 #endif
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	93
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	94 cost = condition->inlineCost(ics);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	95
1487 f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	96 #if !IN_LLVM
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	97 /* Specifically allow:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	98 * if (condition)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	99 * return exp1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	100 * else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	101 * return exp2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	102 * Otherwise, we can't handle return statements nested in if's.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	103 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	104
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	105 if (elsebody && ifbody &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	106 ifbody->isReturnStatement() &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	107 elsebody->isReturnStatement())
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	108 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	109 cost += ifbody->inlineCost(ics);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	110 cost += elsebody->inlineCost(ics);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	111 //printf("cost = %d\n", cost);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	112 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	113 else
1487 f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	114 #endif
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	115 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	116 ics->nested += 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	117 if (ifbody)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	118 cost += ifbody->inlineCost(ics);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	119 if (elsebody)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	120 cost += elsebody->inlineCost(ics);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	121 ics->nested -= 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	122 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	123 return cost;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	124 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	125
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	126 int ReturnStatement::inlineCost(InlineCostState *ics)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	127 {
1487 f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	128 #if !IN_LLVM
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	129 // Can't handle return statements nested in if's
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	130 if (ics->nested)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	131 return COST_MAX;
1487 f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	132 #endif
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	133 return exp ? exp->inlineCost(ics) : 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	134 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	135
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	136 /* -------------------------- */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	137
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	138 int arrayInlineCost(InlineCostState ics, Array arguments)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	139 { int cost = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	140
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	141 if (arguments)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	142 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	143 for (int i = 0; i < arguments->dim; i++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	144 { Expression e = (Expression )arguments->data[i];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	145
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	146 if (e)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	147 cost += e->inlineCost(ics);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	148 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	149 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	150 return cost;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	151 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	152
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	153 int Expression::inlineCost(InlineCostState *ics)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	154 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	155 return 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	156 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	157
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	158 int VarExp::inlineCost(InlineCostState *ics)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	159 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	160 //printf("VarExp::inlineCost() %s\n", toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	161 return 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	162 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	163
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	164 int ThisExp::inlineCost(InlineCostState *ics)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	165 {
1487 f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	166 #if !IN_LLVM
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	167 FuncDeclaration *fd = ics->fd;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	168 if (!ics->hdrscan)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	169 if (fd->isNested() \|\| !ics->hasthis)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	170 return COST_MAX;
1487 f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	171 #endif
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	172 return 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	173 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	174
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	175 int SuperExp::inlineCost(InlineCostState *ics)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	176 {
1487 f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	177 #if !IN_LLVM
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	178 FuncDeclaration *fd = ics->fd;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	179 if (!ics->hdrscan)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	180 if (fd->isNested() \|\| !ics->hasthis)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	181 return COST_MAX;
1487 f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	182 #endif
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	183 return 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	184 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	185
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	186 int TupleExp::inlineCost(InlineCostState *ics)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	187 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	188 return 1 + arrayInlineCost(ics, exps);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	189 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	190
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	191 int ArrayLiteralExp::inlineCost(InlineCostState *ics)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	192 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	193 return 1 + arrayInlineCost(ics, elements);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	194 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	195
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	196 int AssocArrayLiteralExp::inlineCost(InlineCostState *ics)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	197 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	198 return 1 + arrayInlineCost(ics, keys) + arrayInlineCost(ics, values);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	199 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	200
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	201 int StructLiteralExp::inlineCost(InlineCostState *ics)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	202 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	203 return 1 + arrayInlineCost(ics, elements);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	204 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	205
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	206 int FuncExp::inlineCost(InlineCostState *ics)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	207 {
1487 f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	208 // This breaks on LDC too, since nested functions have internal linkage
f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	209 // and thus can't be referenced from other objects.
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	210 // Right now, this makes the function be output to the .obj file twice.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	211 return COST_MAX;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	212 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	213
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	214 int DelegateExp::inlineCost(InlineCostState *ics)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	215 {
1487 f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	216 // This breaks on LDC too, since nested functions have internal linkage
f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	217 // and thus can't be referenced from other objects.
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	218 return COST_MAX;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	219 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	220
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	221 int DeclarationExp::inlineCost(InlineCostState *ics)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	222 { int cost = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	223 VarDeclaration *vd;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	224
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	225 //printf("DeclarationExp::inlineCost()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	226 vd = declaration->isVarDeclaration();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	227 if (vd)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	228 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	229 TupleDeclaration *td = vd->toAlias()->isTupleDeclaration();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	230 if (td)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	231 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	232 #if 1
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	233 return COST_MAX; // finish DeclarationExp::doInline
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	234 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	235 for (size_t i = 0; i < td->objects->dim; i++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	236 { Object o = (Object )td->objects->data[i];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	237 if (o->dyncast() != DYNCAST_EXPRESSION)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	238 return COST_MAX;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	239 Expression eo = (Expression )o;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	240 if (eo->op != TOKdsymbol)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	241 return COST_MAX;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	242 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	243 return td->objects->dim;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	244 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	245 }
1487 f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	246 // This breaks on LDC too, since nested static variables have internal
f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	247 // linkage and thus can't be referenced from other objects.
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	248 if (!ics->hdrscan && vd->isDataseg())
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	249 return COST_MAX;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	250 cost += 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	251
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	252 // Scan initializer (vd->init)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	253 if (vd->init)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	254 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	255 ExpInitializer *ie = vd->init->isExpInitializer();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	256
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	257 if (ie)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	258 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	259 cost += ie->exp->inlineCost(ics);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	260 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	261 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	262 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	263
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	264 // These can contain functions, which when copied, get output twice.
1487 f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	265 // These break on LDC too, since nested static variables and functions have
f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	266 // internal linkage and thus can't be referenced from other objects.
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	267 if (declaration->isStructDeclaration() \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	268 declaration->isClassDeclaration() \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	269 declaration->isFuncDeclaration() \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	270 declaration->isTypedefDeclaration() \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	271 declaration->isTemplateMixin())
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	272 return COST_MAX;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	273
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	274 //printf("DeclarationExp::inlineCost('%s')\n", toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	275 return cost;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	276 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	277
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	278 int UnaExp::inlineCost(InlineCostState *ics)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	279 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	280 return 1 + e1->inlineCost(ics);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	281 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	282
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	283 int AssertExp::inlineCost(InlineCostState *ics)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	284 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	285 return 1 + e1->inlineCost(ics) + (msg ? msg->inlineCost(ics) : 0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	286 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	287
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	288 int BinExp::inlineCost(InlineCostState *ics)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	289 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	290 return 1 + e1->inlineCost(ics) + e2->inlineCost(ics);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	291 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	292
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	293 int CallExp::inlineCost(InlineCostState *ics)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	294 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	295 return 1 + e1->inlineCost(ics) + arrayInlineCost(ics, arguments);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	296 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	297
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	298 int SliceExp::inlineCost(InlineCostState *ics)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	299 { int cost;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	300
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	301 cost = 1 + e1->inlineCost(ics);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	302 if (lwr)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	303 cost += lwr->inlineCost(ics);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	304 if (upr)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	305 cost += upr->inlineCost(ics);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	306 return cost;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	307 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	308
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	309 int ArrayExp::inlineCost(InlineCostState *ics)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	310 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	311 return 1 + e1->inlineCost(ics) + arrayInlineCost(ics, arguments);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	312 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	313
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	314
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	315 int CondExp::inlineCost(InlineCostState *ics)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	316 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	317 return 1 +
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	318 e1->inlineCost(ics) +
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	319 e2->inlineCost(ics) +
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	320 econd->inlineCost(ics);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	321 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	322
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	323
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	324 /* ======================== Perform the inlining ============================== */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	325
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	326 /* Inlining is done by:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	327 * o Converting to an Expression
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	328 * o Copying the trees of the function to be inlined
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	329 * o Renaming the variables
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	330 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	331
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	332 struct InlineDoState
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	333 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	334 VarDeclaration *vthis;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	335 Array from; // old Dsymbols
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	336 Array to; // parallel array of new Dsymbols
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	337 Dsymbol *parent; // new parent
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	338 };
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	339
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	340 Expression Statement::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	341 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	342 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	343 return NULL; // default is we can't inline it
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	344 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	345
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	346 Expression ExpStatement::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	347 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	348 #if LOG
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	349 if (exp) printf("ExpStatement::doInline() '%s'\n", exp->toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	350 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	351 return exp ? exp->doInline(ids) : NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	352 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	353
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	354 Expression CompoundStatement::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	355 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	356 Expression *e = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	357
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	358 //printf("CompoundStatement::doInline() %d\n", statements->dim);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	359 for (size_t i = 0; i < statements->dim; i++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	360 { Statement s = (Statement ) statements->data[i];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	361 if (s)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	362 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	363 Expression *e2 = s->doInline(ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	364 e = Expression::combine(e, e2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	365 if (s->isReturnStatement())
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	366 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	367
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	368 /* Check for:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	369 * if (condition)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	370 * return exp1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	371 * else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	372 * return exp2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	373 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	374 IfStatement *ifs = s->isIfStatement();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	375 if (ifs && ifs->elsebody && ifs->ifbody &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	376 ifs->ifbody->isReturnStatement() &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	377 ifs->elsebody->isReturnStatement()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	378 )
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	379 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	380
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	381 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	382 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	383 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	384 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	385
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	386 Expression UnrolledLoopStatement::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	387 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	388 Expression *e = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	389
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	390 //printf("UnrolledLoopStatement::doInline() %d\n", statements->dim);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	391 for (size_t i = 0; i < statements->dim; i++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	392 { Statement s = (Statement ) statements->data[i];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	393 if (s)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	394 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	395 Expression *e2 = s->doInline(ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	396 e = Expression::combine(e, e2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	397 if (s->isReturnStatement())
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	398 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	399 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	400 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	401 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	402 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	403
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	404 Expression IfStatement::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	405 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	406 Expression *econd;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	407 Expression *e1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	408 Expression *e2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	409 Expression *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	410
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	411 assert(!arg);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	412 econd = condition->doInline(ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	413 assert(econd);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	414 if (ifbody)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	415 e1 = ifbody->doInline(ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	416 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	417 e1 = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	418 if (elsebody)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	419 e2 = elsebody->doInline(ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	420 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	421 e2 = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	422 if (e1 && e2)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	423 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	424 e = new CondExp(econd->loc, econd, e1, e2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	425 e->type = e1->type;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	426 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	427 else if (e1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	428 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	429 e = new AndAndExp(econd->loc, econd, e1);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	430 e->type = Type::tvoid;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	431 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	432 else if (e2)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	433 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	434 e = new OrOrExp(econd->loc, econd, e2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	435 e->type = Type::tvoid;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	436 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	437 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	438 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	439 e = econd;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	440 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	441 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	442 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	443
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	444 Expression ReturnStatement::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	445 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	446 //printf("ReturnStatement::doInline() '%s'\n", exp ? exp->toChars() : "");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	447 return exp ? exp->doInline(ids) : 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	448 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	449
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	450 /* --------------------------------------------------------------- */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	451
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	452 /******************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	453 * Perform doInline() on an array of Expressions.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	454 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	455
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	456 Expressions arrayExpressiondoInline(Expressions a, InlineDoState *ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	457 { Expressions *newa = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	458
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	459 if (a)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	460 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	461 newa = new Expressions();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	462 newa->setDim(a->dim);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	463
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	464 for (int i = 0; i < a->dim; i++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	465 { Expression e = (Expression )a->data[i];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	466
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	467 if (e)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	468 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	469 e = e->doInline(ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	470 newa->data[i] = (void *)e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	471 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	472 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	473 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	474 return newa;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	475 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	476
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	477 Expression Expression::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	478 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	479 //printf("Expression::doInline(%s): %s\n", Token::toChars(op), toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	480 return copy();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	481 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	482
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	483 Expression SymOffExp::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	484 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	485 int i;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	486
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	487 //printf("SymOffExp::doInline(%s)\n", toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	488 for (i = 0; i < ids->from.dim; i++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	489 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	490 if (var == (Declaration *)ids->from.data[i])
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	491 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	492 SymOffExp se = (SymOffExp )copy();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	493
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	494 se->var = (Declaration *)ids->to.data[i];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	495 return se;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	496 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	497 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	498 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	499 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	500
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	501 Expression VarExp::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	502 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	503 int i;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	504
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	505 //printf("VarExp::doInline(%s)\n", toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	506 for (i = 0; i < ids->from.dim; i++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	507 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	508 if (var == (Declaration *)ids->from.data[i])
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	509 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	510 VarExp ve = (VarExp )copy();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	511
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	512 ve->var = (Declaration *)ids->to.data[i];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	513 return ve;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	514 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	515 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	516 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	517 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	518
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	519 Expression ThisExp::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	520 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	521 //if (!ids->vthis)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	522 //error("no 'this' when inlining %s", ids->parent->toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	523 if (!ids->vthis)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	524 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	525 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	526 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	527
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	528 VarExp *ve = new VarExp(loc, ids->vthis);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	529 ve->type = type;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	530 return ve;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	531 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	532
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	533 Expression SuperExp::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	534 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	535 assert(ids->vthis);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	536
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	537 VarExp *ve = new VarExp(loc, ids->vthis);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	538 ve->type = type;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	539 return ve;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	540 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	541
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	542 Expression DeclarationExp::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	543 { DeclarationExp de = (DeclarationExp )copy();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	544 VarDeclaration *vd;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	545
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	546 //printf("DeclarationExp::doInline(%s)\n", toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	547 vd = declaration->isVarDeclaration();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	548 if (vd)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	549 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	550 #if 0
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	551 // Need to figure this out before inlining can work for tuples
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	552 TupleDeclaration *td = vd->toAlias()->isTupleDeclaration();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	553 if (td)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	554 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	555 for (size_t i = 0; i < td->objects->dim; i++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	556 { DsymbolExp se = (DsymbolExp )td->objects->data[i];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	557 assert(se->op == TOKdsymbol);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	558 se->s;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	559 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	560 return st->objects->dim;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	561 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	562 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	563 if (vd->isStatic())
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	564 ;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	565 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	566 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	567 VarDeclaration *vto;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	568
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	569 vto = new VarDeclaration(vd->loc, vd->type, vd->ident, vd->init);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	570 vto = vd;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	571 vto->parent = ids->parent;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	572 #if IN_DMD
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	573 vto->csym = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	574 vto->isym = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	575 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	576
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	577 ids->from.push(vd);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	578 ids->to.push(vto);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	579
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	580 if (vd->init)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	581 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	582 if (vd->init->isVoidInitializer())
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	583 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	584 vto->init = new VoidInitializer(vd->init->loc);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	585 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	586 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	587 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	588 Expression *e = vd->init->toExpression();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	589 assert(e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	590 vto->init = new ExpInitializer(e->loc, e->doInline(ids));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	591 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	592 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	593 de->declaration = (Dsymbol ) (void )vto;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	594 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	595 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	596 /* This needs work, like DeclarationExp::toElem(), if we are
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	597 * to handle TemplateMixin's. For now, we just don't inline them.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	598 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	599 return de;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	600 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	601
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	602 Expression NewExp::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	603 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	604 //printf("NewExp::doInline(): %s\n", toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	605 NewExp ne = (NewExp )copy();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	606
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	607 if (thisexp)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	608 ne->thisexp = thisexp->doInline(ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	609 ne->newargs = arrayExpressiondoInline(ne->newargs, ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	610 ne->arguments = arrayExpressiondoInline(ne->arguments, ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	611 return ne;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	612 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	613
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	614 Expression UnaExp::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	615 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	616 UnaExp ue = (UnaExp )copy();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	617
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	618 ue->e1 = e1->doInline(ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	619 return ue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	620 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	621
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	622 Expression AssertExp::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	623 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	624 AssertExp ae = (AssertExp )copy();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	625
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	626 ae->e1 = e1->doInline(ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	627 if (msg)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	628 ae->msg = msg->doInline(ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	629 return ae;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	630 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	631
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	632 Expression BinExp::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	633 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	634 BinExp be = (BinExp )copy();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	635
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	636 be->e1 = e1->doInline(ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	637 be->e2 = e2->doInline(ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	638 return be;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	639 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	640
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	641 Expression CallExp::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	642 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	643 CallExp *ce;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	644
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	645 ce = (CallExp *)copy();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	646 ce->e1 = e1->doInline(ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	647 ce->arguments = arrayExpressiondoInline(arguments, ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	648 return ce;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	649 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	650
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	651
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	652 Expression IndexExp::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	653 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	654 IndexExp are = (IndexExp )copy();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	655
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	656 are->e1 = e1->doInline(ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	657
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	658 if (lengthVar)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	659 { //printf("lengthVar\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	660 VarDeclaration *vd = lengthVar;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	661 ExpInitializer *ie;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	662 ExpInitializer *ieto;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	663 VarDeclaration *vto;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	664
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	665 vto = new VarDeclaration(vd->loc, vd->type, vd->ident, vd->init);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	666 vto = vd;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	667 vto->parent = ids->parent;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	668 #if IN_DMD
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	669 vto->csym = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	670 vto->isym = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	671 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	672
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	673 ids->from.push(vd);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	674 ids->to.push(vto);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	675
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	676 if (vd->init)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	677 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	678 ie = vd->init->isExpInitializer();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	679 assert(ie);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	680 ieto = new ExpInitializer(ie->loc, ie->exp->doInline(ids));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	681 vto->init = ieto;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	682 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	683
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	684 are->lengthVar = (VarDeclaration ) (void )vto;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	685 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	686 are->e2 = e2->doInline(ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	687 return are;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	688 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	689
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	690
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	691 Expression SliceExp::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	692 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	693 SliceExp are = (SliceExp )copy();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	694
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	695 are->e1 = e1->doInline(ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	696
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	697 if (lengthVar)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	698 { //printf("lengthVar\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	699 VarDeclaration *vd = lengthVar;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	700 ExpInitializer *ie;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	701 ExpInitializer *ieto;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	702 VarDeclaration *vto;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	703
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	704 vto = new VarDeclaration(vd->loc, vd->type, vd->ident, vd->init);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	705 vto = vd;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	706 vto->parent = ids->parent;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	707 #if IN_DMD
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	708 vto->csym = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	709 vto->isym = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	710 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	711
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	712 ids->from.push(vd);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	713 ids->to.push(vto);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	714
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	715 if (vd->init)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	716 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	717 ie = vd->init->isExpInitializer();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	718 assert(ie);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	719 ieto = new ExpInitializer(ie->loc, ie->exp->doInline(ids));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	720 vto->init = ieto;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	721 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	722
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	723 are->lengthVar = (VarDeclaration ) (void )vto;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	724 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	725 if (lwr)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	726 are->lwr = lwr->doInline(ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	727 if (upr)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	728 are->upr = upr->doInline(ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	729 return are;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	730 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	731
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	732
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	733 Expression TupleExp::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	734 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	735 TupleExp *ce;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	736
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	737 ce = (TupleExp *)copy();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	738 ce->exps = arrayExpressiondoInline(exps, ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	739 return ce;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	740 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	741
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	742
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	743 Expression ArrayLiteralExp::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	744 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	745 ArrayLiteralExp *ce;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	746
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	747 ce = (ArrayLiteralExp *)copy();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	748 ce->elements = arrayExpressiondoInline(elements, ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	749 return ce;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	750 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	751
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	752
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	753 Expression AssocArrayLiteralExp::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	754 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	755 AssocArrayLiteralExp *ce;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	756
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	757 ce = (AssocArrayLiteralExp *)copy();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	758 ce->keys = arrayExpressiondoInline(keys, ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	759 ce->values = arrayExpressiondoInline(values, ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	760 return ce;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	761 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	762
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	763
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	764 Expression StructLiteralExp::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	765 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	766 StructLiteralExp *ce;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	767
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	768 ce = (StructLiteralExp *)copy();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	769 ce->elements = arrayExpressiondoInline(elements, ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	770 return ce;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	771 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	772
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	773
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	774 Expression ArrayExp::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	775 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	776 ArrayExp *ce;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	777
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	778 ce = (ArrayExp *)copy();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	779 ce->e1 = e1->doInline(ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	780 ce->arguments = arrayExpressiondoInline(arguments, ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	781 return ce;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	782 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	783
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	784
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	785 Expression CondExp::doInline(InlineDoState ids)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	786 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	787 CondExp ce = (CondExp )copy();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	788
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	789 ce->econd = econd->doInline(ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	790 ce->e1 = e1->doInline(ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	791 ce->e2 = e2->doInline(ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	792 return ce;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	793 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	794
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	795
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	796 /* ========== Walk the parse trees, and inline expand functions ============= */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	797
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	798 /* Walk the trees, looking for functions to inline.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	799 * Inline any that can be.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	800 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	801
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	802 struct InlineScanState
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	803 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	804 FuncDeclaration *fd; // function being scanned
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	805 };
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	806
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	807 Statement Statement::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	808 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	809 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	810 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	811
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	812 Statement ExpStatement::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	813 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	814 #if LOG
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	815 printf("ExpStatement::inlineScan(%s)\n", toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	816 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	817 if (exp)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	818 exp = exp->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	819 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	820 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	821
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	822 Statement CompoundStatement::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	823 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	824 for (size_t i = 0; i < statements->dim; i++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	825 { Statement s = (Statement ) statements->data[i];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	826 if (s)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	827 statements->data[i] = (void *)s->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	828 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	829 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	830 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	831
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	832 Statement UnrolledLoopStatement::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	833 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	834 for (size_t i = 0; i < statements->dim; i++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	835 { Statement s = (Statement ) statements->data[i];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	836 if (s)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	837 statements->data[i] = (void *)s->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	838 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	839 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	840 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	841
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	842 Statement ScopeStatement::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	843 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	844 if (statement)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	845 statement = statement->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	846 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	847 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	848
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	849 Statement WhileStatement::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	850 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	851 condition = condition->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	852 body = body ? body->inlineScan(iss) : NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	853 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	854 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	855
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	856
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	857 Statement DoStatement::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	858 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	859 body = body ? body->inlineScan(iss) : NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	860 condition = condition->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	861 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	862 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	863
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	864
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	865 Statement ForStatement::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	866 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	867 if (init)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	868 init = init->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	869 if (condition)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	870 condition = condition->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	871 if (increment)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	872 increment = increment->inlineScan(iss);
1577 e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	873 if (body)
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	874 body = body->inlineScan(iss);
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	875 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	876 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	877
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	878
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	879 Statement ForeachStatement::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	880 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	881 aggr = aggr->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	882 if (body)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	883 body = body->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	884 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	885 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	886
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	887
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	888 #if DMDV2
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	889 Statement ForeachRangeStatement::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	890 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	891 lwr = lwr->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	892 upr = upr->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	893 if (body)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	894 body = body->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	895 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	896 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	897 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	898
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	899
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	900 Statement IfStatement::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	901 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	902 condition = condition->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	903 if (ifbody)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	904 ifbody = ifbody->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	905 if (elsebody)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	906 elsebody = elsebody->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	907 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	908 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	909
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	910
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	911 Statement SwitchStatement::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	912 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	913 //printf("SwitchStatement::inlineScan()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	914 condition = condition->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	915 body = body ? body->inlineScan(iss) : NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	916 if (sdefault)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	917 sdefault = (DefaultStatement *)sdefault->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	918 if (cases)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	919 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	920 for (int i = 0; i < cases->dim; i++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	921 { Statement *s;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	922
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	923 s = (Statement *) cases->data[i];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	924 cases->data[i] = (void *)s->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	925 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	926 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	927 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	928 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	929
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	930
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	931 Statement CaseStatement::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	932 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	933 //printf("CaseStatement::inlineScan()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	934 exp = exp->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	935 if (statement)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	936 statement = statement->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	937 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	938 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	939
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	940
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	941 Statement DefaultStatement::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	942 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	943 if (statement)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	944 statement = statement->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	945 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	946 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	947
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	948
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	949 Statement ReturnStatement::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	950 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	951 //printf("ReturnStatement::inlineScan()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	952 if (exp)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	953 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	954 exp = exp->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	955 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	956 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	957 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	958
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	959
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	960 Statement SynchronizedStatement::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	961 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	962 if (exp)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	963 exp = exp->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	964 if (body)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	965 body = body->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	966 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	967 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	968
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	969
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	970 Statement WithStatement::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	971 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	972 if (exp)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	973 exp = exp->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	974 if (body)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	975 body = body->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	976 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	977 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	978
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	979
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	980 Statement TryCatchStatement::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	981 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	982 if (body)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	983 body = body->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	984 if (catches)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	985 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	986 for (int i = 0; i < catches->dim; i++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	987 { Catch c = (Catch )catches->data[i];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	988
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	989 if (c->handler)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	990 c->handler = c->handler->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	991 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	992 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	993 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	994 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	995
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	996
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	997 Statement TryFinallyStatement::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	998 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	999 if (body)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1000 body = body->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1001 if (finalbody)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1002 finalbody = finalbody->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1003 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1004 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1005
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1006
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1007 Statement ThrowStatement::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1008 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1009 if (exp)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1010 exp = exp->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1011 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1012 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1013
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1014
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1015 Statement VolatileStatement::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1016 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1017 if (statement)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1018 statement = statement->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1019 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1020 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1021
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1022
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1023 Statement LabelStatement::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1024 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1025 if (statement)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1026 statement = statement->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1027 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1028 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1029
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1030 /* -------------------------- */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1031
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1032 void arrayInlineScan(InlineScanState iss, Array arguments)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1033 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1034 if (arguments)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1035 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1036 for (int i = 0; i < arguments->dim; i++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1037 { Expression e = (Expression )arguments->data[i];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1038
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1039 if (e)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1040 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1041 e = e->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1042 arguments->data[i] = (void *)e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1043 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1044 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1045 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1046 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1047
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1048 Expression Expression::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1049 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1050 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1051 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1052
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1053 void scanVar(Dsymbol s, InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1054 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1055 VarDeclaration *vd = s->isVarDeclaration();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1056 if (vd)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1057 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1058 TupleDeclaration *td = vd->toAlias()->isTupleDeclaration();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1059 if (td)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1060 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1061 for (size_t i = 0; i < td->objects->dim; i++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1062 { DsymbolExp se = (DsymbolExp )td->objects->data[i];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1063 assert(se->op == TOKdsymbol);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1064 scanVar(se->s, iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1065 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1066 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1067 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1068 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1069 // Scan initializer (vd->init)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1070 if (vd->init)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1071 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1072 ExpInitializer *ie = vd->init->isExpInitializer();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1073
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1074 if (ie)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1075 {
1577 e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1076 #if DMDV2
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1077 if (vd->type)
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1078 { Type *tb = vd->type->toBasetype();
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1079 if (tb->ty == Tstruct)
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1080 { StructDeclaration sd = ((TypeStruct )tb)->sym;
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1081 if (sd->cpctor)
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1082 { /* The problem here is that if the initializer is a
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1083 * function call that returns a struct S with a cpctor:
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1084 * S s = foo();
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1085 * the postblit is done by the return statement in foo()
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1086 * in s2ir.c, the intermediate code generator.
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1087 * But, if foo() is inlined and now the code looks like:
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1088 * S s = x;
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1089 * the postblit is not there, because such assignments
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1090 * are rewritten as s.cpctor(&x) by the front end.
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1091 * So, the inlining won't get the postblit called.
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1092 * Work around by not inlining these cases.
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1093 * A proper fix would be to move all the postblit
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1094 * additions to the front end.
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1095 */
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1096 return;
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1097 }
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1098 }
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1099 }
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1100 #endif
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1101 ie->exp = ie->exp->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1102 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1103 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1104 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1105 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1106 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1107
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1108 Expression DeclarationExp::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1109 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1110 //printf("DeclarationExp::inlineScan()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1111 scanVar(declaration, iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1112 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1113 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1114
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1115 Expression UnaExp::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1116 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1117 e1 = e1->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1118 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1119 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1120
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1121 Expression AssertExp::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1122 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1123 e1 = e1->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1124 if (msg)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1125 msg = msg->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1126 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1127 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1128
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1129 Expression BinExp::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1130 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1131 e1 = e1->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1132 e2 = e2->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1133 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1134 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1135
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1136
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1137 Expression CallExp::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1138 { Expression *e = this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1139
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1140 //printf("CallExp::inlineScan()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1141 e1 = e1->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1142 arrayInlineScan(iss, arguments);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1143
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1144 if (e1->op == TOKvar)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1145 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1146 VarExp ve = (VarExp )e1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1147 FuncDeclaration *fd = ve->var->isFuncDeclaration();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1148
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1149 if (fd && fd != iss->fd && fd->canInline(0))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1150 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1151 e = fd->doInline(iss, NULL, arguments);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1152 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1153 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1154 else if (e1->op == TOKdotvar)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1155 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1156 DotVarExp dve = (DotVarExp )e1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1157 FuncDeclaration *fd = dve->var->isFuncDeclaration();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1158
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1159 if (fd && fd != iss->fd && fd->canInline(1))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1160 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1161 if (dve->e1->op == TOKcall &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1162 dve->e1->type->toBasetype()->ty == Tstruct)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1163 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1164 /* To create ethis, we'll need to take the address
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1165 * of dve->e1, but this won't work if dve->e1 is
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1166 * a function call.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1167 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1168 ;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1169 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1170 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1171 e = fd->doInline(iss, dve->e1, arguments);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1172 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1173 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1174
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1175 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1176 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1177
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1178
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1179 Expression SliceExp::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1180 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1181 e1 = e1->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1182 if (lwr)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1183 lwr = lwr->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1184 if (upr)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1185 upr = upr->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1186 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1187 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1188
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1189
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1190 Expression TupleExp::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1191 { Expression *e = this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1192
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1193 //printf("TupleExp::inlineScan()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1194 arrayInlineScan(iss, exps);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1195
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1196 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1197 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1198
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1199
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1200 Expression ArrayLiteralExp::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1201 { Expression *e = this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1202
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1203 //printf("ArrayLiteralExp::inlineScan()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1204 arrayInlineScan(iss, elements);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1205
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1206 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1207 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1208
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1209
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1210 Expression AssocArrayLiteralExp::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1211 { Expression *e = this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1212
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1213 //printf("AssocArrayLiteralExp::inlineScan()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1214 arrayInlineScan(iss, keys);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1215 arrayInlineScan(iss, values);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1216
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1217 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1218 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1219
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1220
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1221 Expression StructLiteralExp::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1222 { Expression *e = this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1223
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1224 //printf("StructLiteralExp::inlineScan()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1225 arrayInlineScan(iss, elements);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1226
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1227 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1228 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1229
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1230
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1231 Expression ArrayExp::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1232 { Expression *e = this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1233
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1234 //printf("ArrayExp::inlineScan()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1235 e1 = e1->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1236 arrayInlineScan(iss, arguments);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1237
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1238 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1239 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1240
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1241
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1242 Expression CondExp::inlineScan(InlineScanState iss)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1243 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1244 econd = econd->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1245 e1 = e1->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1246 e2 = e2->inlineScan(iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1247 return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1248 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1249
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1250
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1251 /* ========== =============== */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1252
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1253 void FuncDeclaration::inlineScan()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1254 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1255 InlineScanState iss;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1256
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1257 #if LOG
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1258 printf("FuncDeclaration::inlineScan('%s')\n", toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1259 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1260 memset(&iss, 0, sizeof(iss));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1261 iss.fd = this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1262 if (fbody)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1263 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1264 inlineNest++;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1265 fbody = fbody->inlineScan(&iss);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1266 inlineNest--;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1267 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1268 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1269
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1270 int FuncDeclaration::canInline(int hasthis, int hdrscan)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1271 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1272 InlineCostState ics;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1273 int cost;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1274
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1275 #define CANINLINE_LOG 0
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1276
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1277 #if CANINLINE_LOG
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1278 printf("FuncDeclaration::canInline(hasthis = %d, '%s')\n", hasthis, toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1279 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1280
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1281 if (needThis() && !hasthis)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1282 return 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1283
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1284 if (inlineNest \|\| (semanticRun < 3 && !hdrscan))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1285 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1286 #if CANINLINE_LOG
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1287 printf("\t1: no, inlineNest = %d, semanticRun = %d\n", inlineNest, semanticRun);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1288 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1289 return 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1290 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1291
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1292 switch (inlineStatus)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1293 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1294 case ILSyes:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1295 #if CANINLINE_LOG
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1296 printf("\t1: yes %s\n", toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1297 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1298 return 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1299
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1300 case ILSno:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1301 #if CANINLINE_LOG
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1302 printf("\t1: no %s\n", toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1303 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1304 return 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1305
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1306 case ILSuninitialized:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1307 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1308
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1309 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1310 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1311 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1312
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1313 if (type)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1314 { assert(type->ty == Tfunction);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1315 TypeFunction tf = (TypeFunction )(type);
1487 f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	1316 #if IN_LLVM
f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	1317 // LDC: Only extern(C) varargs count.
f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	1318 if (tf->linkage != LINKd)
f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	1319 #endif
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1320 if (tf->varargs == 1) // no variadic parameter lists
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1321 goto Lno;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1322
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1323 /* Don't inline a function that returns non-void, but has
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1324 * no return expression.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1325 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1326 if (tf->next && tf->next->ty != Tvoid &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1327 !(hasReturnExp & 1) &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1328 !hdrscan)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1329 goto Lno;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1330 }
1487 f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	1331 #if !IN_LLVM
f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	1332 // LDC: Only extern(C) varargs count, and ctors use extern(D).
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1333 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1334 { CtorDeclaration *ctor = isCtorDeclaration();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1335
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1336 if (ctor && ctor->varargs == 1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1337 goto Lno;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1338 }
1487 f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	1339 #endif
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1340
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1341 if (
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1342 !fbody \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1343 !hdrscan &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1344 (
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1345 #if 0
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1346 isCtorDeclaration() \|\| // cannot because need to convert:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1347 // return;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1348 // to:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1349 // return this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1350 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1351 isSynchronized() \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1352 isImportedSymbol() \|\|
1487 f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	1353 #if !IN_LLVM
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1354 #if DMDV2
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1355 closureVars.dim \|\| // no nested references to this frame
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1356 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1357 nestedFrameRef \|\| // no nested references to this frame
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1358 #endif
1487 f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	1359 #endif // !IN_LLVM
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1360 (isVirtual() && !isFinal())
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1361 ))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1362 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1363 goto Lno;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1364 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1365
1487 f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	1366 #if !IN_LLVM
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1367 /* If any parameters are Tsarray's (which are passed by reference)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1368 * or out parameters (also passed by reference), don't do inlining.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1369 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1370 if (parameters)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1371 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1372 for (int i = 0; i < parameters->dim; i++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1373 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1374 VarDeclaration v = (VarDeclaration )parameters->data[i];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1375 if (v->isOut() \|\| v->isRef() \|\| v->type->toBasetype()->ty == Tsarray)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1376 goto Lno;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1377 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1378 }
1487 f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	1379 #endif
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1380
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1381 memset(&ics, 0, sizeof(ics));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1382 ics.hasthis = hasthis;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1383 ics.fd = this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1384 ics.hdrscan = hdrscan;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1385 cost = fbody->inlineCost(&ics);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1386 #if CANINLINE_LOG
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1387 printf("cost = %d\n", cost);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1388 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1389 if (cost >= COST_MAX)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1390 goto Lno;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1391
1487 f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	1392 #if !IN_LLVM
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1393 if (!hdrscan) // Don't scan recursively for header content scan
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1394 inlineScan();
1487 f62347c22d81 Apply changes from r1482 to D2 frontend too. Completely untested, but ldc2 Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	1395 #endif
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1396
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1397 Lyes:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1398 if (!hdrscan) // Don't modify inlineStatus for header content scan
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1399 inlineStatus = ILSyes;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1400 #if CANINLINE_LOG
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1401 printf("\t2: yes %s\n", toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1402 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1403 return 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1404
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1405 Lno:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1406 if (!hdrscan) // Don't modify inlineStatus for header content scan
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1407 inlineStatus = ILSno;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1408 #if CANINLINE_LOG
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1409 printf("\t2: no %s\n", toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1410 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1411 return 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1412 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1413
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1414 Expression FuncDeclaration::doInline(InlineScanState iss, Expression ethis, Array arguments)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1415 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1416 InlineDoState ids;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1417 DeclarationExp *de;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1418 Expression *e = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1419
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1420 #if LOG
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1421 printf("FuncDeclaration::doInline('%s')\n", toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1422 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1423
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1424 memset(&ids, 0, sizeof(ids));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1425 ids.parent = iss->fd;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1426
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1427 // Set up vthis
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1428 if (ethis)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1429 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1430 VarDeclaration *vthis;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1431 ExpInitializer *ei;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1432 VarExp *ve;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1433
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1434 #if STRUCTTHISREF
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1435 if (ethis->type->ty == Tpointer)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1436 { Type *t = ethis->type->nextOf();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1437 ethis = new PtrExp(ethis->loc, ethis);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1438 ethis->type = t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1439 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1440 ei = new ExpInitializer(ethis->loc, ethis);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1441
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1442 vthis = new VarDeclaration(ethis->loc, ethis->type, Id::This, ei);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1443 if (ethis->type->ty != Tclass)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1444 vthis->storage_class = STCref;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1445 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1446 vthis->storage_class = STCin;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1447 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1448 if (ethis->type->ty != Tclass && ethis->type->ty != Tpointer)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1449 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1450 ethis = ethis->addressOf(NULL);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1451 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1452
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1453 ei = new ExpInitializer(ethis->loc, ethis);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1454
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1455 vthis = new VarDeclaration(ethis->loc, ethis->type, Id::This, ei);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1456 vthis->storage_class = STCin;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1457 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1458 vthis->linkage = LINKd;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1459 vthis->parent = iss->fd;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1460
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1461 ve = new VarExp(vthis->loc, vthis);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1462 ve->type = vthis->type;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1463
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1464 ei->exp = new AssignExp(vthis->loc, ve, ethis);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1465 ei->exp->type = ve->type;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1466 #if STRUCTTHISREF
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1467 if (ethis->type->ty != Tclass)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1468 { /* This is a reference initialization, not a simple assignment.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1469 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1470 ei->exp->op = TOKconstruct;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1471 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1472 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1473
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1474 ids.vthis = vthis;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1475 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1476
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1477 // Set up parameters
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1478 if (ethis)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1479 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1480 e = new DeclarationExp(0, ids.vthis);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1481 e->type = Type::tvoid;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1482 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1483
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1484 if (arguments && arguments->dim)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1485 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1486 assert(parameters->dim == arguments->dim);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1487
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1488 for (int i = 0; i < arguments->dim; i++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1489 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1490 VarDeclaration vfrom = (VarDeclaration )parameters->data[i];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1491 VarDeclaration *vto;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1492 Expression arg = (Expression )arguments->data[i];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1493 ExpInitializer *ei;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1494 VarExp *ve;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1495
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1496 ei = new ExpInitializer(arg->loc, arg);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1497
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1498 vto = new VarDeclaration(vfrom->loc, vfrom->type, vfrom->ident, ei);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1499 vto->storage_class \|= vfrom->storage_class & (STCin \| STCout \| STClazy \| STCref);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1500 vto->linkage = vfrom->linkage;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1501 vto->parent = iss->fd;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1502 //printf("vto = '%s', vto->storage_class = x%x\n", vto->toChars(), vto->storage_class);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1503 //printf("vto->parent = '%s'\n", iss->fd->toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1504
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1505 ve = new VarExp(vto->loc, vto);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1506 //ve->type = vto->type;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1507 ve->type = arg->type;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1508
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1509 ei->exp = new AssignExp(vto->loc, ve, arg);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1510 ei->exp->type = ve->type;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1511 //ve->type->print();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1512 //arg->type->print();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1513 //ei->exp->print();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1514
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1515 ids.from.push(vfrom);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1516 ids.to.push(vto);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1517
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1518 de = new DeclarationExp(0, vto);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1519 de->type = Type::tvoid;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1520
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1521 e = Expression::combine(e, de);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1522 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1523 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1524
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1525 inlineNest++;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1526 Expression *eb = fbody->doInline(&ids);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1527 inlineNest--;
1577 e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1528 //eb->type->print();
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1529 //eb->print();
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1487 diff changeset	1530 //eb->dump(0);
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1531 return Expression::combine(e, eb);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1532 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1533
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1534
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1535

Mercurial > projects > ldc

annotate dmd2/inline.c @ 1638:0de4525a9ed6