/usr/src/gcc-5/debian/patches/go-escape-analysis6.diff is in gcc-5-source 5.3.1-14ubuntu2.
This file is owned by root:root, with mode 0o644.
The actual contents of the file can be viewed below.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 | # DP: escape: Analyze multiple result type assertions.
For multi-result type assertions, the object being converted is hidden
behind unsafe conversions and calls to runtime methods. This change
allows the analysis to make edges between the result of the assertion
and the object being asserted.
Index: b/src/gcc/go/gofrontend/expressions.h
===================================================================
--- a/src/gcc/go/gofrontend/expressions.h
+++ b/src/gcc/go/gofrontend/expressions.h
@@ -32,6 +32,7 @@ class Temporary_reference_expression;
class Set_and_use_temporary_expression;
class String_expression;
class Type_conversion_expression;
+class Unsafe_type_conversion_expression;
class Unary_expression;
class Binary_expression;
class Call_expression;
@@ -571,6 +572,15 @@ class Expression
conversion_expression()
{ return this->convert<Type_conversion_expression, EXPRESSION_CONVERSION>(); }
+ // If this is an unsafe conversion expression, return the
+ // Unsafe_type_conversion_expression structure. Otherwise, return NULL.
+ Unsafe_type_conversion_expression*
+ unsafe_conversion_expression()
+ {
+ return this->convert<Unsafe_type_conversion_expression,
+ EXPRESSION_UNSAFE_CONVERSION>();
+ }
+
// Return whether this is the expression nil.
bool
is_nil_expression() const
@@ -1505,6 +1515,57 @@ class Type_conversion_expression : publi
bool may_convert_function_types_;
};
+// An unsafe type conversion, used to pass values to builtin functions.
+
+class Unsafe_type_conversion_expression : public Expression
+{
+ public:
+ Unsafe_type_conversion_expression(Type* type, Expression* expr,
+ Location location)
+ : Expression(EXPRESSION_UNSAFE_CONVERSION, location),
+ type_(type), expr_(expr)
+ { }
+
+ Expression*
+ expr() const
+ { return this->expr_; }
+
+ protected:
+ int
+ do_traverse(Traverse* traverse);
+
+ bool
+ do_is_immutable() const;
+
+ Type*
+ do_type()
+ { return this->type_; }
+
+ void
+ do_determine_type(const Type_context*)
+ { this->expr_->determine_type_no_context(); }
+
+ Expression*
+ do_copy()
+ {
+ return new Unsafe_type_conversion_expression(this->type_,
+ this->expr_->copy(),
+ this->location());
+ }
+
+ Bexpression*
+ do_get_backend(Translate_context*);
+
+ void
+ do_dump_expression(Ast_dump_context*) const;
+
+ private:
+ // The type to convert to.
+ Type* type_;
+ // The expression to convert.
+ Expression* expr_;
+};
+
// A Unary expression.
class Unary_expression : public Expression
@@ -2024,6 +2085,10 @@ class Call_result_expression : public Ex
call() const
{ return this->call_; }
+ unsigned int
+ index() const
+ { return this->index_; }
+
protected:
int
do_traverse(Traverse*);
Index: b/src/gcc/go/gofrontend/escape.cc
===================================================================
--- a/src/gcc/go/gofrontend/escape.cc
+++ b/src/gcc/go/gofrontend/escape.cc
@@ -547,6 +547,41 @@ Build_connection_graphs::resolve_var_ref
expr = expr->type_guard_expression()->expr();
break;
+ case Expression::EXPRESSION_UNSAFE_CONVERSION:
+ {
+ Expression* e = expr->unsafe_conversion_expression()->expr();
+ if (e->call_result_expression() != NULL
+ && e->call_result_expression()->index() == 0)
+ {
+ // a, ok := p.(T) gets lowered into a call to one of the interface
+ // to type conversion functions instead of a type guard expression.
+ // We only want to make a connection between a and p, the bool
+ // result should not escape because p escapes.
+ e = e->call_result_expression()->call();
+
+ Named_object* fn =
+ e->call_expression()->fn()->func_expression()->named_object();
+ std::string fn_name = fn->name();
+ if (fn->package() == NULL
+ && fn->is_function_declaration()
+ && !fn->func_declaration_value()->asm_name().empty())
+ {
+ if (fn_name == "ifaceI2E2"
+ || fn_name == "ifaceI2I2")
+ e = e->call_expression()->args()->at(0);
+ else if (fn_name == "ifaceE2I2"
+ || fn_name == "ifaceI2I2"
+ || fn_name == "ifaceE2T2P"
+ || fn_name == "ifaceI2T2P"
+ || fn_name == "ifaceE2T2"
+ || fn_name == "ifaceI2T2")
+ e = e->call_expression()->args()->at(1);
+ }
+ }
+ expr = e;
+ }
+ break;
+
default:
done = true;
break;
Index: b/src/gcc/go/gofrontend/expressions.cc
===================================================================
--- a/src/gcc/go/gofrontend/expressions.cc
+++ b/src/gcc/go/gofrontend/expressions.cc
@@ -3391,52 +3391,7 @@ Expression::make_cast(Type* type, Expres
return new Type_conversion_expression(type, val, location);
}
-// An unsafe type conversion, used to pass values to builtin functions.
-
-class Unsafe_type_conversion_expression : public Expression
-{
- public:
- Unsafe_type_conversion_expression(Type* type, Expression* expr,
- Location location)
- : Expression(EXPRESSION_UNSAFE_CONVERSION, location),
- type_(type), expr_(expr)
- { }
-
- protected:
- int
- do_traverse(Traverse* traverse);
-
- bool
- do_is_immutable() const;
-
- Type*
- do_type()
- { return this->type_; }
-
- void
- do_determine_type(const Type_context*)
- { this->expr_->determine_type_no_context(); }
-
- Expression*
- do_copy()
- {
- return new Unsafe_type_conversion_expression(this->type_,
- this->expr_->copy(),
- this->location());
- }
-
- Bexpression*
- do_get_backend(Translate_context*);
-
- void
- do_dump_expression(Ast_dump_context*) const;
-
- private:
- // The type to convert to.
- Type* type_;
- // The expression to convert.
- Expression* expr_;
-};
+// Class Unsafe_type_conversion_expression.
// Traversal.
|