Merge branch 'maint-r16' into maint

* maint-r16:
  Prepare release
  Prepare release
  Do not count offline run-queues as empty
  Prepare release
  Prevent loss of objects after the extension marker
  Don't lose the extension mark for object set parameters

Conflicts:
	erts/vsn.mk

6 files changed, 127 insertions, 10 deletions

diff --git a/lib/asn1/doc/src/notes.xml b/lib/asn1/doc/src/notes.xml
index e619408591..76d605569d 100644
--- a/lib/asn1/doc/src/notes.xml
+++ b/lib/asn1/doc/src/notes.xml
@@ -31,6 +31,23 @@
   <p>This document describes the changes made to the asn1 application.</p>
 
 
+<section><title>Asn1 2.0.1.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    When an object set is an actual parameter, the extension
+	    marker for the object set could get lost (which would
+	    cause the decoding of unknown values to fail).</p>
+          <p>
+	    Own Id: OTP-10995 Aux Id: seq12290 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Asn1 2.0.1.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl
index e1911d8170..0622998445 100644
--- a/lib/asn1/src/asn1ct_check.erl
+++ b/lib/asn1/src/asn1ct_check.erl
@@ -1025,8 +1025,8 @@ prepare_objset({{'SingleValue',Set},Ext}) ->
 %%    {set,lists:append([Set,Ext]),true};
 prepare_objset({Set,Ext}) when is_list(Set) ->
     {set,merge_sets(Set,Ext),true};
-prepare_objset({ObjDef={object,definedsyntax,_ObjFields},_Ext}) ->
-    {set,[ObjDef],true};
+prepare_objset({{object,definedsyntax,_ObjFields}=Set,Ext}) ->
+    {set,merge_sets(Set, Ext),true};
 prepare_objset(ObjDef={object,definedsyntax,_ObjFields}) ->
     {set,[ObjDef],false};
 prepare_objset({ObjDef=#type{},Ext}) when is_list(Ext) ->
@@ -4034,8 +4034,8 @@ categorize(S,value,Type,Value) ->
     [#valuedef{type=Type,value=Value,module=S#state.mname}].
 
 
-parse_objectset({valueset,T=#type{}}) ->
-    [T];
+parse_objectset({valueset,#type{def=#'Externaltypereference'{}=Ref}}) ->
+    Ref;
 parse_objectset({valueset,Set}) ->
     Set;
 parse_objectset(#type{def=Ref}) when is_record(Ref,'Externaltypereference') ->
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index 62418e554e..8deabece37 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -829,8 +829,9 @@ testInfObjectClass(Config, Rule, Opts) ->
 testParameterizedInfObj(Config) ->
     test(Config, fun testParameterizedInfObj/3).
 testParameterizedInfObj(Config, Rule, Opts) ->
-    asn1_test_lib:compile("Param", Config, [Rule|Opts]),
-    testParameterizedInfObj:main(Rule).
+    Files = ["Param","Param2"],
+    asn1_test_lib:compile_all(Files, Config, [Rule|Opts]),
+    testParameterizedInfObj:main(Config, Rule).
 
 testMergeCompile(Config) -> test(Config, fun testMergeCompile/3).
 testMergeCompile(Config, Rule, Opts) ->
diff --git a/lib/asn1/test/asn1_SUITE_data/Param2.asn1 b/lib/asn1/test/asn1_SUITE_data/Param2.asn1
new file mode 100644
index 0000000000..09ccb367d8
--- /dev/null
+++ b/lib/asn1/test/asn1_SUITE_data/Param2.asn1
@@ -0,0 +1,48 @@
+Param2 DEFINITIONS AUTOMATIC TAGS ::=
+BEGIN
+
+  S1AP-PROTOCOL-IES ::= CLASS {
+	&id				INTEGER UNIQUE,
+	&Value
+  }
+  WITH SYNTAX {
+	ID				&id
+	TYPE				&Value
+  }
+
+  ProtocolIE-Field {S1AP-PROTOCOL-IES : IEsSetParam} ::= SEQUENCE {
+	id		S1AP-PROTOCOL-IES.&id ({IEsSetParam}),
+	value		S1AP-PROTOCOL-IES.&Value ({IEsSetParam}{@id})
+  }
+
+  ProtocolIE-Container {S1AP-PROTOCOL-IES : IEsSetParam} ::=
+         SEQUENCE (SIZE (0..10)) OF ProtocolIE-Field {{IEsSetParam}}
+
+  HandoverRequired ::= SEQUENCE {
+	protocolIEs ProtocolIE-Container { { HandoverRequiredIEs } },
+	...
+  }
+
+  HandoverRequiredIEs S1AP-PROTOCOL-IES ::= {
+    { ID 1 TYPE OCTET STRING } |
+    { ID 2 TYPE INTEGER },
+--Delete-start
+    ...,
+    { ID 100 TYPE INTEGER (0..1023) } |
+    { ID 101 TYPE ENUMERATED {true,false} }
+--Delete-end
+  }
+
+  SingleRoot ::= SEQUENCE {
+	protocolIEs ProtocolIE-Container { { SingleRootIEs } },
+	...
+  }
+
+  -- The extension was lost when there was a single root item.
+  SingleRootIEs S1AP-PROTOCOL-IES ::= {
+    { ID 1 TYPE OCTET STRING },
+    ...,
+    { ID 2 TYPE INTEGER }
+  }
+
+END
diff --git a/lib/asn1/test/testParameterizedInfObj.erl b/lib/asn1/test/testParameterizedInfObj.erl
index 17108e285b..212df79fd4 100644
--- a/lib/asn1/test/testParameterizedInfObj.erl
+++ b/lib/asn1/test/testParameterizedInfObj.erl
@@ -20,7 +20,7 @@
 
 -module(testParameterizedInfObj).
 
--export([main/1,ranap/1]).
+-export([main/2,ranap/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
@@ -31,7 +31,11 @@
 -record('Iu-ReleaseCommand',{protocolIEs,protocolExtensions}).
 
 
-main(Erule) ->
+main(Config, Erule) ->
+    param(Erule),
+    param2(Config, Erule).
+
+param(Erule) ->
     PERVal = #'AllocationOrRetentionPriority'
       {priorityLevel = true,
        iE_Extensions = 
@@ -84,7 +88,6 @@ main(Erule) ->
 
     ok.
 
-
 ranap(_Erule) ->    
     PIEVal2 = [{'ProtocolIE-Field',4,ignore,{radioNetwork,'rab-pre-empted'}}],
     ?line Val2 = 
@@ -102,3 +105,51 @@ open_type(uper,Val) when is_list(Val) ->
     list_to_binary(Val);
 open_type(_,Val) ->
     Val.
+
+param2(Config, Erule) ->
+    roundtrip2('HandoverRequired',
+	       {'HandoverRequired',
+		[{'ProtocolIE-Field',1,"ABC"},
+		 {'ProtocolIE-Field',2,577799}]}),
+    Enc = roundtrip2('HandoverRequired',
+		     {'HandoverRequired',
+		      [{'ProtocolIE-Field',1,"ABC"},
+		       {'ProtocolIE-Field',2,-42},
+		       {'ProtocolIE-Field',100,533},
+		       {'ProtocolIE-Field',101,true}]}),
+
+    %% Now remove the data after the extension mark in the object set.
+    DataDir = ?config(data_dir, Config),
+    CaseDir = ?config(case_dir, Config),
+    Asn1SrcBase = "Param2.asn1",
+    Asn1SrcFile0 = filename:join(DataDir, Asn1SrcBase),
+    {ok,Src0} = file:read_file(Asn1SrcFile0),
+    Src = re:replace(Src0, "--Delete-start.*?--Delete-end", "...\n",
+		     [dotall,global,{return,binary}]),
+    io:format("~s\n\n", [Src]),
+
+    Asn1SrcFile = filename:join(CaseDir, Asn1SrcBase),
+    ok = file:write_file(Asn1SrcFile, Src),
+    ok = asn1ct:compile(Asn1SrcFile,
+			[{i,DataDir},{outdir,CaseDir},Erule]),
+
+    %% Decompile extended data.
+    {ok,{'HandoverRequired',[{'ProtocolIE-Field',1,"ABC"},
+			     {'ProtocolIE-Field',2,-42},
+			     {'ProtocolIE-Field',100,Open100},
+			     {'ProtocolIE-Field',101,Open101}]}} =
+	asn1_wrapper:decode('Param2', 'HandoverRequired', Enc),
+    true = is_binary(Open100),
+    true = is_binary(Open101),
+
+    %% Test single root.
+    roundtrip2('SingleRoot',
+	       {'SingleRoot',[{'ProtocolIE-Field',1,"ABC"},
+			      {'ProtocolIE-Field',2,9999}]}),
+    ok.
+
+
+roundtrip2(T, V) ->
+    {ok,Enc} = asn1_wrapper:encode('Param2', T, V),
+    {ok,V} = asn1_wrapper:decode('Param2', T, Enc),
+    Enc.
diff --git a/lib/asn1/vsn.mk b/lib/asn1/vsn.mk
index 3c4f3ff122..9245f83280 100644
--- a/lib/asn1/vsn.mk
+++ b/lib/asn1/vsn.mk
@@ -1,2 +1,2 @@
 #next version number to use is 2.0
-ASN1_VSN = 2.0.1.1
+ASN1_VSN = 2.0.1.2