Merge branch 'gustav/asn1/integer_single_value_predefined/OTP-10139' into maint

* gustav/asn1/integer_single_value_predefined/OTP-10139:
  In generation of encoding functions for enumeration types,
  the values used for generating the range check in case of
  a value range should be sorted and have duplicates removed.
  Add sorting in constraint checking on single values.

Conflicts:
	lib/asn1/test/testConstraints.erl

5 files changed, 29 insertions, 22 deletions

diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl
index 494a2eddd9..59e82b7a57 100644
--- a/lib/asn1/src/asn1ct_check.erl
+++ b/lib/asn1/src/asn1ct_check.erl
@@ -4177,7 +4177,7 @@ check_constraint(S,{'SizeConstraint',Lb}) ->
 
 check_constraint(S,{'SingleValue', L}) when is_list(L) ->
     F = fun(A) -> resolv_value(S,A) end,
-    {'SingleValue',lists:map(F,L)};
+    {'SingleValue',lists:sort(lists:map(F,L))};
     
 check_constraint(S,{'SingleValue', V}) when is_integer(V) ->
     Val = resolv_value(S,V),
diff --git a/lib/asn1/src/asn1ct_gen_per.erl b/lib/asn1/src/asn1ct_gen_per.erl
index 5f42eacbdc..bd5b81991d 100644
--- a/lib/asn1/src/asn1ct_gen_per.erl
+++ b/lib/asn1/src/asn1ct_gen_per.erl
@@ -321,19 +321,13 @@ effective_constr(_,[]) ->
     [];
 effective_constr('SingleValue',List) ->
     SVList = lists:flatten(lists:map(fun(X)->element(2,X)end,List)),
-    % sort and remove duplicates
-    SortedSVList = lists:sort(SVList),
-    RemoveDup = fun([],_) ->[];
-		   ([H],_) -> [H];
-		   ([H,H|T],F) -> F([H|T],F);
-		   ([H|T],F) -> [H|F(T,F)]
-		end,
-    
-    case RemoveDup(SortedSVList,RemoveDup) of
+    %% Sort and remove duplicates before generating SingleValue or ValueRange
+    %% In case of ValueRange, also check for 'MIN and 'MAX'
+    case lists:usort(SVList) of
 	[N] ->
 	    [{'SingleValue',N}];
-	L when is_list(L) -> 
-	    [{'ValueRange',{hd(L),lists:last(L)}}]
+	L when is_list(L) ->
+	    [{'ValueRange',{least_Lb(L),greatest_Ub(L)}}]
     end;
 effective_constr('ValueRange',List) ->
     LBs = lists:map(fun({_,{Lb,_}})-> Lb end,List),
diff --git a/lib/asn1/src/asn1ct_gen_per_rt2ct.erl b/lib/asn1/src/asn1ct_gen_per_rt2ct.erl
index eda0faad3c..16eec92847 100644
--- a/lib/asn1/src/asn1ct_gen_per_rt2ct.erl
+++ b/lib/asn1/src/asn1ct_gen_per_rt2ct.erl
@@ -670,18 +670,13 @@ effective_constr(_,[]) ->
     [];
 effective_constr('SingleValue',List) ->
     SVList = lists:flatten(lists:map(fun(X)->element(2,X)end,List)),
-    % sort and remove duplicates
-    RemoveDup = fun([],_) ->[];
-		   ([H],_) -> [H];
-		   ([H,H|T],F) -> F([H|T],F);
-		   ([H|T],F) -> [H|F(T,F)]
-		end,
-    
-    case RemoveDup(SVList,RemoveDup) of
+    %% Sort and remove duplicates before generating SingleValue or ValueRange
+    %% In case of ValueRange, also check for 'MIN and 'MAX'
+    case lists:usort(SVList) of
 	[N] ->
 	    [{'SingleValue',N}];
-	L when is_list(L) -> 
-	    [{'ValueRange',{hd(L),lists:last(L)}}]
+	L when is_list(L) ->
+	    [{'ValueRange',{least_Lb(L),greatest_Ub(L)}}]
     end;
 effective_constr('ValueRange',List) ->
     LBs = lists:map(fun({_,{Lb,_}})-> Lb end,List),
diff --git a/lib/asn1/test/asn1_SUITE_data/Constraints.py b/lib/asn1/test/asn1_SUITE_data/Constraints.py
index dc65e7009a..87243121f7 100644
--- a/lib/asn1/test/asn1_SUITE_data/Constraints.py
+++ b/lib/asn1/test/asn1_SUITE_data/Constraints.py
@@ -4,6 +4,8 @@ BEGIN
 -- Single Value
 SingleValue ::= INTEGER (1)
 SingleValue2 ::= INTEGER (1..20)
+predefined INTEGER ::= 1
+SingleValue3 ::= INTEGER (predefined | 5 | 10)
 Range2to19 ::= INTEGER (1<..<20)
 Range10to20 ::= INTEGER (10..20)
 ContainedSubtype ::= INTEGER (INCLUDES Range10to20)
diff --git a/lib/asn1/test/testConstraints.erl b/lib/asn1/test/testConstraints.erl
index d32e99eaaf..543c106e8a 100644
--- a/lib/asn1/test/testConstraints.erl
+++ b/lib/asn1/test/testConstraints.erl
@@ -85,6 +85,22 @@ int_constraints(Rules) ->
 	  end,
 
     %%==========================================================
+    %% SingleValue3 ::=  INTEGER (Predefined | 5 | 10)
+    %% Testcase for OTP-10139. A single value subtyping of an integer type
+    %% where one value is predefined.
+    %%==========================================================
+
+    ?line {ok,BytesSV3} = asn1_wrapper:encode('Constraints','SingleValue3',1),
+    ?line {ok,1} = asn1_wrapper:decode('Constraints','SingleValue3',
+                                       lists:flatten(BytesSV3)),
+    ?line {ok,BytesSV3_2} = asn1_wrapper:encode('Constraints','SingleValue3',5),
+    ?line {ok,5} = asn1_wrapper:decode('Constraints','SingleValue3',
+                                       lists:flatten(BytesSV3_2)),
+    ?line {ok,BytesSV3_3} = asn1_wrapper:encode('Constraints','SingleValue3',10),
+    ?line {ok,10} = asn1_wrapper:decode('Constraints','SingleValue3',
+                                        lists:flatten(BytesSV3_3)),
+
+    %%==========================================================
     %% Range2to19 ::=  INTEGER (1<..<20) 
     %%==========================================================