Mercurial > hg > truffle

annotate graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConvertDeoptimizeToGuardPhase.java @ 8382:496db8bf756d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Killing cfg path to deoptimization.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Tue, 19 Mar 2013 18:05:35 +0100
parents 0269ef50021f
children 0edb2a515cb1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4548
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
1 /*
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
2 * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
4 *
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
5 * This code is free software; you can redistribute it and/or modify it
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
6 * under the terms of the GNU General Public License version 2 only, as
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
7 * published by the Free Software Foundation.
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
8 *
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
9 * This code is distributed in the hope that it will be useful, but WITHOUT
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
12 * version 2 for more details (a copy is included in the LICENSE file that
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
13 * accompanied this code).
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
14 *
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
15 * You should have received a copy of the GNU General Public License version
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
16 * 2 along with this work; if not, write to the Free Software Foundation,
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
18 *
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
20 * or visit www.oracle.com if you need additional information or have any
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
21 * questions.
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
22 */
6526
ee651c726397 split phases out of graal.phases project into graal.phases.common project
Doug Simon <doug.simon@oracle.com>
parents: 6525
diff changeset
23 package com.oracle.graal.phases.common;
4548
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
24
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
25 import java.util.*;
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
26
5060
4ed4295ce15f Update import statements.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 5059
diff changeset
27 import com.oracle.graal.debug.*;
4ed4295ce15f Update import statements.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 5059
diff changeset
28 import com.oracle.graal.graph.*;
4ed4295ce15f Update import statements.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 5059
diff changeset
29 import com.oracle.graal.nodes.*;
6548
4dc9e468c8b0 The lowering currently does not support a FixedGuard as the usage of an InstanceOfNode
Christian Wimmer <christian.wimmer@oracle.com>
parents: 6526
diff changeset
30 import com.oracle.graal.nodes.java.*;
8382
496db8bf756d Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8276
diff changeset
31 import com.oracle.graal.nodes.util.*;
6526
ee651c726397 split phases out of graal.phases project into graal.phases.common project
Doug Simon <doug.simon@oracle.com>
parents: 6525
diff changeset
32 import com.oracle.graal.phases.*;
4548
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
33
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
34 public class ConvertDeoptimizeToGuardPhase extends Phase {
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
35
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
36 private static BeginNode findBeginNode(Node startNode) {
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
37 Node n = startNode;
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
38 while (true) {
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
39 if (n instanceof BeginNode) {
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
40 return (BeginNode) n;
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
41 } else {
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
42 n = n.predecessor();
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
43 }
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
44 }
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
45 }
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
46
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
47 @Override
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
48 protected void run(final StructuredGraph graph) {
4682
7cb57ac24ab8 Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents: 4548
diff changeset
49 if (graph.getNodes(DeoptimizeNode.class).isEmpty()) {
4548
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
50 return;
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
51 }
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
52
4682
7cb57ac24ab8 Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents: 4548
diff changeset
53 for (DeoptimizeNode d : graph.getNodes(DeoptimizeNode.class)) {
5095
57ae0b1cc74a Fix possible endless recursion in ConvertDeoptimizeToGuardPhase.
Andreas Woess <andreas.woess@jku.at>
parents: 5061
diff changeset
54 visitDeoptBegin(findBeginNode(d), d, graph);
4548
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
55 }
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
56
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
57 new DeadCodeEliminationPhase().apply(graph);
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
58 }
4682
7cb57ac24ab8 Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents: 4548
diff changeset
59
5095
57ae0b1cc74a Fix possible endless recursion in ConvertDeoptimizeToGuardPhase.
Andreas Woess <andreas.woess@jku.at>
parents: 5061
diff changeset
60 private void visitDeoptBegin(BeginNode deoptBegin, DeoptimizeNode deopt, StructuredGraph graph) {
4682
7cb57ac24ab8 Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents: 4548
diff changeset
61 if (deoptBegin instanceof MergeNode) {
7cb57ac24ab8 Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents: 4548
diff changeset
62 MergeNode mergeNode = (MergeNode) deoptBegin;
5095
57ae0b1cc74a Fix possible endless recursion in ConvertDeoptimizeToGuardPhase.
Andreas Woess <andreas.woess@jku.at>
parents: 5061
diff changeset
63 Debug.log("Visiting %s followed by %s", mergeNode, deopt);
4682
7cb57ac24ab8 Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents: 4548
diff changeset
64 List<EndNode> ends = mergeNode.forwardEnds().snapshot();
7cb57ac24ab8 Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents: 4548
diff changeset
65 for (EndNode end : ends) {
7cb57ac24ab8 Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents: 4548
diff changeset
66 if (!end.isDeleted()) {
7cb57ac24ab8 Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents: 4548
diff changeset
67 BeginNode beginNode = findBeginNode(end);
5095
57ae0b1cc74a Fix possible endless recursion in ConvertDeoptimizeToGuardPhase.
Andreas Woess <andreas.woess@jku.at>
parents: 5061
diff changeset
68 if (!(beginNode instanceof MergeNode)) {
57ae0b1cc74a Fix possible endless recursion in ConvertDeoptimizeToGuardPhase.
Andreas Woess <andreas.woess@jku.at>
parents: 5061
diff changeset
69 visitDeoptBegin(beginNode, deopt, graph);
57ae0b1cc74a Fix possible endless recursion in ConvertDeoptimizeToGuardPhase.
Andreas Woess <andreas.woess@jku.at>
parents: 5061
diff changeset
70 }
4682
7cb57ac24ab8 Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents: 4548
diff changeset
71 }
7cb57ac24ab8 Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents: 4548
diff changeset
72 }
5095
57ae0b1cc74a Fix possible endless recursion in ConvertDeoptimizeToGuardPhase.
Andreas Woess <andreas.woess@jku.at>
parents: 5061
diff changeset
73 if (mergeNode.isDeleted()) {
57ae0b1cc74a Fix possible endless recursion in ConvertDeoptimizeToGuardPhase.
Andreas Woess <andreas.woess@jku.at>
parents: 5061
diff changeset
74 if (!deopt.isDeleted()) {
57ae0b1cc74a Fix possible endless recursion in ConvertDeoptimizeToGuardPhase.
Andreas Woess <andreas.woess@jku.at>
parents: 5061
diff changeset
75 Debug.log("Merge deleted, deopt moved to %s", findBeginNode(deopt));
57ae0b1cc74a Fix possible endless recursion in ConvertDeoptimizeToGuardPhase.
Andreas Woess <andreas.woess@jku.at>
parents: 5061
diff changeset
76 visitDeoptBegin(findBeginNode(deopt), deopt, graph);
57ae0b1cc74a Fix possible endless recursion in ConvertDeoptimizeToGuardPhase.
Andreas Woess <andreas.woess@jku.at>
parents: 5061
diff changeset
77 }
4682
7cb57ac24ab8 Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents: 4548
diff changeset
78 }
8382
496db8bf756d Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8276
diff changeset
79 return;
4682
7cb57ac24ab8 Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents: 4548
diff changeset
80 } else if (deoptBegin.predecessor() instanceof IfNode) {
7cb57ac24ab8 Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents: 4548
diff changeset
81 IfNode ifNode = (IfNode) deoptBegin.predecessor();
7cb57ac24ab8 Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents: 4548
diff changeset
82 BeginNode otherBegin = ifNode.trueSuccessor();
7767
4a6646d8eb87 separate BooleanNode and ConstantNode hierarchy, rename BooleanNode to LogicNode and LogicNode to BitLogicNode
Lukas Stadler <lukas.stadler@jku.at>
parents: 7660
diff changeset
83 LogicNode conditionNode = ifNode.condition();
8382
496db8bf756d Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8276
diff changeset
84 if (!(conditionNode instanceof InstanceOfNode) && !(conditionNode instanceof InstanceOfDynamicNode)) {
7530
5e3d1a68664e applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents: 6564
diff changeset
85 // TODO The lowering currently does not support a FixedGuard as the usage of an
5e3d1a68664e applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents: 6564
diff changeset
86 // InstanceOfNode. Relax this restriction.
8382
496db8bf756d Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8276
diff changeset
87 FixedGuardNode guard = graph.add(new FixedGuardNode(conditionNode, deopt.reason(), deopt.action(), deoptBegin == ifNode.trueSuccessor()));
496db8bf756d Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8276
diff changeset
88 FixedWithNextNode pred = (FixedWithNextNode) ifNode.predecessor();
496db8bf756d Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8276
diff changeset
89 if (deoptBegin == ifNode.trueSuccessor()) {
496db8bf756d Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8276
diff changeset
90 graph.removeSplitPropagate(ifNode, ifNode.falseSuccessor());
496db8bf756d Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8276
diff changeset
91 } else {
496db8bf756d Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8276
diff changeset
92 graph.removeSplitPropagate(ifNode, ifNode.trueSuccessor());
496db8bf756d Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8276
diff changeset
93 }
496db8bf756d Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8276
diff changeset
94 Debug.log("Converting %s on %-5s branch of %s to guard for remaining branch %s.", deopt, deoptBegin == ifNode.trueSuccessor() ? "true" : "false", ifNode, otherBegin);
496db8bf756d Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8276
diff changeset
95 FixedNode next = pred.next();
496db8bf756d Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8276
diff changeset
96 pred.setNext(guard);
496db8bf756d Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8276
diff changeset
97 guard.setNext(next);
6548
4dc9e468c8b0 The lowering currently does not support a FixedGuard as the usage of an InstanceOfNode
Christian Wimmer <christian.wimmer@oracle.com>
parents: 6526
diff changeset
98 return;
4dc9e468c8b0 The lowering currently does not support a FixedGuard as the usage of an InstanceOfNode
Christian Wimmer <christian.wimmer@oracle.com>
parents: 6526
diff changeset
99 }
8382
496db8bf756d Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8276
diff changeset
100 }
496db8bf756d Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8276
diff changeset
101
496db8bf756d Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8276
diff changeset
102 // We could not convert the control split - at least cut off control flow after the split.
496db8bf756d Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8276
diff changeset
103 FixedNode next = deoptBegin.next();
496db8bf756d Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8276
diff changeset
104 if (next != deopt) {
496db8bf756d Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8276
diff changeset
105 FixedWithNextNode pred = (FixedWithNextNode) deopt.predecessor();
496db8bf756d Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8276
diff changeset
106 pred.setNext(null);
496db8bf756d Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8276
diff changeset
107 deoptBegin.setNext(deopt);
496db8bf756d Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8276
diff changeset
108 GraphUtil.killCFG(next);
4682
7cb57ac24ab8 Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents: 4548
diff changeset
109 }
7cb57ac24ab8 Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents: 4548
diff changeset
110 }
4548
f55914bc1d67 Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
111 }