aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler/src
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2016-09-07 14:24:38 +0200
committerBjörn Gustavsson <[email protected]>2016-09-07 14:24:38 +0200
commitc542eabc91c9a4c1e6b9e16ba565e99984de41d2 (patch)
tree804b0fc6079dd0d39a85b1c58201c6438cbed0f1 /lib/compiler/src
parentddc0c20c521e00932187f55d37c2948ed324a12d (diff)
parentb834a527c2f420a80806fbf36d4585c1e530061c (diff)
downloadotp-c542eabc91c9a4c1e6b9e16ba565e99984de41d2.tar.gz
otp-c542eabc91c9a4c1e6b9e16ba565e99984de41d2.tar.bz2
otp-c542eabc91c9a4c1e6b9e16ba565e99984de41d2.zip
Merge branch 'maint'
* maint: [snmp] Correct bug when path to mib contains UTF-8 characters [ic] Fix but when UTF-8 character in path to idl spec sys_core_fold: Don't move a fun into a guard
Diffstat (limited to 'lib/compiler/src')
-rw-r--r--lib/compiler/src/sys_core_fold.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/compiler/src/sys_core_fold.erl b/lib/compiler/src/sys_core_fold.erl
index b8065176a3..caa30a5ef4 100644
--- a/lib/compiler/src/sys_core_fold.erl
+++ b/lib/compiler/src/sys_core_fold.erl
@@ -468,7 +468,8 @@ bitstr(#c_bitstr{val=Val,size=Size}=BinSeg, Sub) ->
%% Currently, we don't attempt to check binaries because they
%% are difficult to check.
-is_safe_simple(#c_var{}, _) -> true;
+is_safe_simple(#c_var{}=Var, _) ->
+ not cerl:is_c_fname(Var);
is_safe_simple(#c_cons{hd=H,tl=T}, Sub) ->
is_safe_simple(H, Sub) andalso is_safe_simple(T, Sub);
is_safe_simple(#c_tuple{es=Es}, Sub) -> is_safe_simple_list(Es, Sub);