Version 1.4.0-dev.6.1 svn merge -c 35852 https://dart.googlecode.com/svn/branches/bleeding_edge trunk svn merge -c 35855 https://dart.googlecode.com/svn/branches/bleeding_edge trunk svn merge -c 35857 https://dart.googlecode.com/svn/branches/bleeding_edge trunk svn merge -c 35858 https://dart.googlecode.com/svn/branches/bleeding_edge trunk git-svn-id: http://dart.googlecode.com/svn/trunk@35881 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/runtime/bin/vmservice/client/deployed/web/index.html_bootstrap.dart.js b/runtime/bin/vmservice/client/deployed/web/index.html_bootstrap.dart.js index 959e609..87017fc 100644 --- a/runtime/bin/vmservice/client/deployed/web/index.html_bootstrap.dart.js +++ b/runtime/bin/vmservice/client/deployed/web/index.html_bootstrap.dart.js
@@ -1792,8 +1792,7 @@ XL:function(a){var z=this.Rn[2*a+this.hG+3] return init.metadata[z]}, BX:function(a,b){var z=this.Rv -if(typeof b!=="number")return b.C() -if(b<z)return +if(J.u6(b,z))return return this.Rn[3+b-z]}, Fk:function(a){var z=this.Rv if(a<z)return @@ -2344,7 +2343,7 @@ v=w.u8(z,a)+1 w.UZ(z,v,v+y)}}, Kt:{ -"^":"a;ph>,xy", +"^":"a;ph>,xy<", static:{r1:[function(a){return a!=null?J.AG(a):"<null>"},"$1","My",2,0,20]}}, Ni:{ "^":"a;UQ>", @@ -2366,40 +2365,31 @@ tM:[function(a,b){var z,y z=this.zU if(a>>>0!==a||a>=z.length)return H.e(z,a) -z=J.U8(z[a]) +y=J.UQ(J.U8(z[a]),b) +z=this.oH if(b>>>0!==b||b>=9)return H.e(z,b) -y=z[b] -return this.oH[b].xy.$1(y)},"$2","gls",4,0,97,98,[],99,[],"getFormattedValue",82], -Qs:[function(a){var z,y +return z[b].gxy().$1(y)},"$2","gls",4,0,97,98,[],99,[],"getFormattedValue",82], +Qs:[function(a){var z if(!J.de(a,this.pT)){z=this.oH if(a>>>0!==a||a>=9)return H.e(z,a) -return z[a].ph+"\u2003"}z=this.oH +return J.WB(J.Kz(z[a]),"\u2003")}z=this.oH if(a>>>0!==a||a>=9)return H.e(z,a) -z=z[a] -y=this.jV?"\u25bc":"\u25b2" -return z.ph+y},"$1","gpo",2,0,18,99,[],"getColumnLabel",82], +z=J.Kz(z[a]) +return J.WB(z,this.jV?"\u25bc":"\u25b2")},"$1","gpo",2,0,18,99,[],"getColumnLabel",82], TK:[function(a,b){var z=this.zU if(a>>>0!==a||a>=z.length)return H.e(z,a) -z=J.U8(z[a]) -if(b>>>0!==b||b>=9)return H.e(z,b) -return z[b]},"$2","gyY",4,0,100,98,[],99,[],"getValue",82]}, +return J.UQ(J.U8(z[a]),b)},"$2","gyY",4,0,100,98,[],99,[],"getValue",82]}, Nu:{ "^":"Tp:75;a", -$2:function(a,b){var z,y,x,w,v,u +$2:function(a,b){var z,y,x,w z=this.a y=z.zU if(a>>>0!==a||a>=y.length)return H.e(y,a) -x=J.U8(y[a]) -w=z.pT -if(w>>>0!==w||w>=9)return H.e(x,w) -v=x[w] +x=J.UQ(J.U8(y[a]),z.pT) if(b>>>0!==b||b>=y.length)return H.e(y,b) -y=J.U8(y[b]) -w=z.pT -if(w>>>0!==w||w>=9)return H.e(y,w) -u=y[w] -if(z.jV)return J.oE(u,v) -else return J.oE(v,u)}, +w=J.UQ(J.U8(y[b]),z.pT) +if(z.jV)return J.oE(w,x) +else return J.oE(x,w)}, $isEH:true}}],["app_bootstrap","file:///usr/local/google/home/johnmccutchan/workspace/dart-repo/dart/runtime/bin/vmservice/client/web/index.html_bootstrap.dart",,E,{ "^":"", De:[function(){$.x2=["package:observatory/src/elements/observatory_element.dart","package:observatory/src/elements/nav_bar.dart","package:observatory/src/elements/breakpoint_list.dart","package:observatory/src/elements/service_ref.dart","package:observatory/src/elements/class_ref.dart","package:observatory/src/elements/curly_block.dart","package:observatory/src/elements/instance_ref.dart","package:observatory/src/elements/eval_box.dart","package:observatory/src/elements/eval_link.dart","package:observatory/src/elements/field_ref.dart","package:observatory/src/elements/function_ref.dart","package:observatory/src/elements/library_ref.dart","package:observatory/src/elements/script_ref.dart","package:observatory/src/elements/class_view.dart","package:observatory/src/elements/code_ref.dart","package:observatory/src/elements/code_view.dart","package:observatory/src/elements/collapsible_content.dart","package:observatory/src/elements/error_view.dart","package:observatory/src/elements/field_view.dart","package:observatory/src/elements/script_inset.dart","package:observatory/src/elements/function_view.dart","package:observatory/src/elements/heap_map.dart","package:observatory/src/elements/isolate_ref.dart","package:observatory/src/elements/isolate_summary.dart","package:observatory/src/elements/isolate_view.dart","package:observatory/src/elements/instance_view.dart","package:observatory/src/elements/json_view.dart","package:observatory/src/elements/library_view.dart","package:observatory/src/elements/sliding_checkbox.dart","package:observatory/src/elements/isolate_profile.dart","package:observatory/src/elements/heap_profile.dart","package:observatory/src/elements/script_view.dart","package:observatory/src/elements/stack_frame.dart","package:observatory/src/elements/stack_trace.dart","package:observatory/src/elements/vm_view.dart","package:observatory/src/elements/service_view.dart","package:observatory/src/elements/response_viewer.dart","package:observatory/src/elements/observatory_application.dart","package:observatory/src/elements/service_exception_view.dart","package:observatory/src/elements/service_error_view.dart","package:observatory/src/elements/vm_ref.dart","main.dart"] @@ -2645,9 +2635,10 @@ n3:function(a,b,c){var z for(z=H.VM(new H.a7(a,a.length,0,null),[H.Kp(a,0)]);z.G();)b=c.$2(b,z.lo) return b}, -mx:function(a,b,c){var z,y,x -for(y=0;x=$.RM(),y<x.length;++y)if(x[y]===a)return H.d(b)+"..."+H.d(c) -z=P.p9("") +mx:function(a,b,c){var z,y,x,w +for(y=0;x=$.RM(),y<x.length;++y){x=x[y] +w=a +if(x==null?w==null:x===w)return H.d(b)+"..."+H.d(c)}z=P.p9("") try{$.RM().push(a) z.KF(b) z.We(a,", ") @@ -4244,7 +4235,7 @@ PJ:function(a){var z=$.X3 $.X3=a return z}, -L2:[function(a,b,c,d,e){a.Gr(new P.pK(d,e))},"$5","xP",10,0,32,33,[],34,[],35,[],30,[],31,[]], +L2:[function(a,b,c,d,e){a.Gr(new P.pK(d,e))},"$5","Gx",10,0,32,33,[],34,[],35,[],30,[],31,[]], T8:[function(a,b,c,d){var z,y if(J.de($.X3,c))return d.$0() z=P.PJ(c) @@ -5317,7 +5308,7 @@ $isEH:true}, nU:{ "^":"a;", -gE2:function(){return P.xP()}, +gE2:function(){return P.Gx()}, hk:function(a,b){return this.gE2().$2(a,b)}, gcP:function(){return P.AI()}, Gr:function(a){return this.gcP().$1(a)}, @@ -5384,7 +5375,7 @@ y.We(z,", ") y.KF(")") return y.vM}, -Vr:function(a,b){var z,y,x,w,v,u,t,s,r,q +Vr:function(a,b){var z,y,x,w,v,u,t,s,r,q,p z=a.gA(a) y=0 x=0 @@ -5405,24 +5396,29 @@ for(;z.G();t=s,s=r){r=z.gl();++x if(x>100){while(!0){if(!(y>75&&x>3))break if(0>=b.length)return H.e(b,0) -y-=b.pop().length+2;--x}b.push("...") +q=J.WB(J.q8(b.pop()),2) +if(typeof q!=="number")return H.s(q) +y-=q;--x}b.push("...") return}}u=H.d(t) v=H.d(s) y+=v.length+u.length+4}}if(x>b.length+2){y+=5 -q="..."}else q=null +p="..."}else p=null while(!0){if(!(y>80&&b.length>3))break if(0>=b.length)return H.e(b,0) -y-=b.pop().length+2 -if(q==null){y+=5 -q="..."}}if(q!=null)b.push(q) +q=J.WB(J.q8(b.pop()),2) +if(typeof q!=="number")return H.s(q) +y-=q +if(p==null){y+=5 +p="..."}}if(p!=null)b.push(p) b.push(u) b.push(v)}, L5:function(a,b,c,d,e){return H.VM(new P.YB(0,null,null,null,null,null,0),[d,e])}, Ls:function(a,b,c,d){return H.VM(new P.b6(0,null,null,null,null,null,0),[d])}, -vW:function(a){var z,y,x,w +vW:function(a){var z,y,x,w,v z={} -for(x=0;w=$.tw(),x<w.length;++x)if(w[x]===a)return"{...}" -y=P.p9("") +for(x=0;w=$.tw(),x<w.length;++x){w=w[x] +v=a +if(w==null?v==null:w===v)return"{...}"}y=P.p9("") try{$.tw().push(a) y.KF("{") z.a=!0 @@ -6623,7 +6619,7 @@ return this.Wb(z)}, zw:function(a){var z for(z=this.Jt;a!=null;){z.push(a) -a=a.Bb}}, +a=J.NI(a)}}, G:function(){var z,y,x z=this.Dn if(this.qT!==z.qT)throw H.b(P.a4(z)) @@ -6632,11 +6628,11 @@ return!1}if(z.bb!==this.bb&&this.ya!=null){x=this.ya C.Nm.sB(y,0) if(x==null)this.zw(z.aY) -else{z.vh(x.G3) +else{z.vh(J.WI(x)) this.zw(z.aY.T8)}}if(0>=y.length)return H.e(y,0) z=y.pop() this.ya=z -this.zw(z.T8) +this.zw(J.xP(z)) return!0}, Qf:function(a,b){this.zw(a.aY)}}, OG:{ @@ -6665,17 +6661,17 @@ $isyN:true}, DN:{ "^":"S6B;Dn,Jt,qT,bb,ya", -Wb:function(a){return a.G3}}, +Wb:function(a){return J.WI(a)}}, ZM:{ "^":"S6B;Dn,Jt,qT,bb,ya", -Wb:function(a){return a.P}, +Wb:function(a){return J.Vm(a)}, $asS6B:function(a,b){return[b]}}, HW:{ "^":"S6B;Dn,Jt,qT,bb,ya", Wb:function(a){return a}, $asS6B:function(a){return[[P.qv,a]]}}}],["dart.convert","dart:convert",,P,{ "^":"", -VQ:function(a,b){var z=new P.JC() +VQ:function(a,b){var z=b==null?new P.JC():b return z.$2(null,new P.f1(z).$1(a))}, BS:function(a,b){var z,y,x,w x=a @@ -6719,7 +6715,7 @@ bu:function(a){return"Cyclic error in JSON stringify"}, static:{TP:function(a){return new P.K8(a,null)}}}, by:{ -"^":"Uk;N5,iY", +"^":"Uk;N5<,iY", pW:function(a,b){return P.BS(a,this.gHe().N5)}, kV:function(a){return this.pW(a,null)}, Co:function(a,b){var z=this.gZE() @@ -6732,7 +6728,7 @@ "^":"zF;UM,Xi", $aszF:function(){return[P.a,P.qU]}}, Cf:{ -"^":"zF;N5", +"^":"zF;N5<", $aszF:function(){return[P.qU,P.a]}}, Sh:{ "^":"a;iY,Vy,bV", @@ -7093,7 +7089,7 @@ v=new P.P7().$1(C.CD.JV(y,1000000)) return H.d(C.CD.cU(y,3600000000))+":"+H.d(x)+":"+H.d(w)+"."+H.d(v)}, $isa6:true, -static:{"^":"SF,S4d,pk,LoB,zj5,b2,jS,ll,DoM,f4,vd,IJ,iI,Wr,fm,yn",k5:function(a,b,c,d,e,f){return new P.a6(a*86400000000+b*3600000000+e*60000000+f*1000000+d*1000+c)}}}, +static:{"^":"SF,S4d,pk,LoB,zj5,b2,jS,ll,DoM,f4,za,IJ,iI,Wr,fm,yn",k5:function(a,b,c,d,e,f){return new P.a6(a*86400000000+b*3600000000+e*60000000+f*1000000+d*1000+c)}}}, P7:{ "^":"Tp:18;", $1:function(a){if(a>=100000)return H.d(a) @@ -7378,7 +7374,7 @@ else this.HC=e this.r0=this.x6(c,d)}, $isiD:true, -static:{"^":"n2,q7,tv,ux,vI,IE,fd,IL,yT,zk,yt,fC,O5,FsP,qf,ML,j3,r5,Yk,qs,Fm,WT,t2,H5,zst,LF,ws,Sp,aJ,JA7,HM,za,fbQ",hK:function(a1){var z,y,x,w,v,u,t,s,r,q,p,o,n,m,l,k,j,i,h,g,f,e,d,c,b,a,a0 +static:{"^":"n2,q7,tv,ux,vI,IE,fd,IL,yT,zk,yt,fC,O5,FsP,qf,ML,j3,r5,Yk,qs,Fm,WT,t2,H5,zst,LF,ws,Sp,aJ,JA7,HM,SQU,fbQ",hK:function(a1){var z,y,x,w,v,u,t,s,r,q,p,o,n,m,l,k,j,i,h,g,f,e,d,c,b,a,a0 x=new P.hP() w=new P.Uo(a1) v=J.U6(a1) @@ -7390,7 +7386,7 @@ q=v.j(a1,t) if(q<128){p=q>>>4 if(p>=8)return H.e(C.mK,p) -p=(C.mK[p]&C.jn.W4(1,q&15))!==0}else p=!1 +p=J.mQ(C.mK[p],C.jn.W4(1,q&15))!==0}else p=!1 if(!p){if(q===58){s=r t=s}else{t=r-1 s=0}break}}}else{t=0 @@ -7457,7 +7453,7 @@ if(u)throw H.b(P.u("Illegal scheme: "+a)) if(z.$1(v)!==!0){if(v<128){u=v>>>4 if(u>=8)return H.e(C.mK,u) -u=(C.mK[u]&C.jn.W4(1,v&15))!==0}else u=!1 +u=J.mQ(C.mK[u],C.jn.W4(1,v&15))!==0}else u=!1 if(u);else throw H.b(P.u("Illegal scheme: "+a)) x=!1}}return x?a:a.toLowerCase()},LE:function(a,b){var z,y,x z={} @@ -7559,7 +7555,7 @@ u=J.Wx(v) if(u.C(v,128)){t=u.m(v,4) if(t>=8)return H.e(a,t) -t=(a[t]&C.jn.W4(1,u.i(v,15)))!==0}else t=!1 +t=J.mQ(a[t],C.jn.W4(1,u.i(v,15)))!==0}else t=!1 if(t){u=H.Lw(v) y.vM+=u}else if(d&&u.n(v,32)){u=H.Lw(43) y.vM+=u}else{u=H.Lw(37) @@ -7570,7 +7566,7 @@ $1:function(a){var z if(a<128){z=a>>>4 if(z>=8)return H.e(C.aa,z) -z=(C.aa[z]&C.jn.W4(1,a&15))!==0}else z=!1 +z=J.mQ(C.aa[z],C.jn.W4(1,a&15))!==0}else z=!1 return z}, $isEH:true}, Uo:{ @@ -7584,7 +7580,7 @@ $1:function(a){var z if(a<128){z=a>>>4 if(z>=8)return H.e(C.HE,z) -z=(C.HE[z]&C.jn.W4(1,a&15))!==0}else z=!1 +z=J.mQ(C.HE[z],C.jn.W4(1,a&15))!==0}else z=!1 return z}, $isEH:true}, Kd:{ @@ -7618,7 +7614,7 @@ $1:function(a){var z if(a<128){z=C.jn.GG(a,4) if(z>=8)return H.e(C.kg,z) -z=(C.kg[z]&C.jn.W4(1,a&15))!==0}else z=!1 +z=J.mQ(C.kg[z],C.jn.W4(1,a&15))!==0}else z=!1 return z}, $isEH:true}, wm:{ @@ -9169,15 +9165,12 @@ Up:function(a){a=536870911&a+((67108863&a)<<3>>>0) a^=a>>>11 return 536870911&a+((16383&a)<<15>>>0)}, -J:function(a,b){var z -if(typeof a!=="number")throw H.b(P.u(a)) +J:function(a,b){if(typeof a!=="number")throw H.b(P.u(a)) if(typeof b!=="number")throw H.b(P.u(b)) if(a>b)return b if(a<b)return a if(typeof b==="number"){if(typeof a==="number")if(a===0)return(a+b)*a*b -if(a===0)z=b===0?1/b<0:b<0 -else z=!1 -if(z||isNaN(b))return b +if(a===0&&C.ON.gzP(b)||C.ON.gG0(b))return b return a}return a}, y:function(a,b){if(typeof a!=="number")throw H.b(P.u(a)) if(typeof b!=="number")throw H.b(P.u(b)) @@ -9770,7 +9763,7 @@ if(z===!0)return if(a.bY!=null){a.TS=this.ct(a,C.S4,z,!0) a.oy=this.ct(a,C.UY,a.oy,null) -this.LY(a,a.jv).ml(new R.Kz(a)).YM(new R.Ou(a))}},"$3","gDf",6,0,130,53,[],57,[],123,[],"evalNow"], +this.LY(a,a.jv).ml(new R.Ou(a)).YM(new R.tM(a))}},"$3","gDf",6,0,130,53,[],57,[],123,[],"evalNow"], "@":function(){return[C.Vn]}, static:{fL:[function(a){var z,y,x,w z=$.Nd() @@ -9792,22 +9785,22 @@ Nr:{ "^":"xc+Pi;", $isd3:true}, -Kz:{ +Ou:{ "^":"Tp:86;a-29", $1:[function(a){var z,y z=this.a y=J.RE(z) y.soy(z,y.ct(z,C.UY,y.goy(z),a))},"$1",null,2,0,86,92,[],"call"], $isEH:true}, -"+ Kz":[124], -Ou:{ +"+ Ou":[124], +tM:{ "^":"Tp:22;b-29", $0:[function(){var z,y z=this.b y=J.RE(z) y.sTS(z,y.ct(z,C.S4,y.gTS(z),!1))},"$0",null,0,0,22,"call"], $isEH:true}, -"+ Ou":[124]}],["field_ref_element","package:observatory/src/elements/field_ref.dart",,D,{ +"+ tM":[124]}],["field_ref_element","package:observatory/src/elements/field_ref.dart",,D,{ "^":"", UL:{ "^":["xI;tY-108,Pe-109,AP,fn,AP,fn,dZ,Sa,Uk,oq,Wz,SO,B7,X0-102",null,null,null,null,null,null,null,null,null,null,null,null,null,function(){return[C.Nw]}], @@ -9830,7 +9823,7 @@ jM:{ "^":["pva;vt%-101,AP,fn,AP,fn,dZ,Sa,Uk,oq,Wz,SO,B7,X0-102",null,null,null,null,null,null,null,null,null,null,null,null,function(){return[C.Nw]}], gt0:[function(a){return a.vt},null,null,1,0,103,"field",82,104], -st0:[function(a,b){a.vt=this.ct(a,C.Gx,a.vt,b)},null,null,3,0,105,27,[],"field",82], +st0:[function(a,b){a.vt=this.ct(a,C.IV,a.vt,b)},null,null,3,0,105,27,[],"field",82], pA:[function(a,b){J.am(a.vt).YM(b)},"$1","gvC",2,0,26,106,[],"refresh"], "@":function(){return[C.vc]}, static:{Sy:[function(a){var z,y,x,w @@ -10868,28 +10861,30 @@ v=a.gZ0() for(u=0;u<a.glI().length;++u){y=a.glI() if(u>=y.length)return H.e(y,u) -t=y[u].SP +t=y[u].gSP() s=[] if(t>0){if(typeof v!=="number")return H.s(v) s.push("t "+C.CD.yM(t-v,2))}else s.push("") y=a.glI() if(u>=y.length)return H.e(y,u) -r=y[u].wZ +r=y[u].gaQ() if(r===0){q=0 while(!0){y=a.glI() if(u>=y.length)return H.e(y,u) -if(!(q<y[u].hw.length))break +y=J.q8(y[u].ghw()) +if(typeof y!=="number")return H.s(y) +if(!(q<y))break c$1:{if(q===w)break c$1 s.push(0)}++q}}else{q=0 while(!0){y=a.glI() if(u>=y.length)return H.e(y,u) -if(!(q<y[u].hw.length))break +y=J.q8(y[u].ghw()) +if(typeof y!=="number")return H.s(y) +if(!(q<y))break c$1:{if(q===w)break c$1 y=a.glI() if(u>=y.length)return H.e(y,u) -y=y[u].hw -if(q>=y.length)return H.e(y,q) -s.push(C.CD.yu(J.FW(y[q],r)*100))}++q}}y=[] +s.push(C.CD.yu(J.FW(J.UQ(y[u].ghw(),q),r)*100))}++q}}y=[] C.Nm.FV(y,C.Nm.ez(s,P.En())) y=new P.Tz(y) y.$builtinTypeInfo=[null] @@ -11378,7 +11373,7 @@ grZ:[function(a){return a.Jo},null,null,1,0,126,"last",82,104], srZ:[function(a,b){a.Jo=this.ct(a,C.QL,a.Jo,b)},null,null,3,0,127,27,[],"last",82], "@":function(){return[C.KI]}, -static:{IV:[function(a){var z,y,x,w +static:{PQ:[function(a){var z,y,x,w z=$.Nd() y=P.Py(null,null,null,P.qU,W.I0) x=P.qU @@ -11588,9 +11583,8 @@ w.$builtinTypeInfo=[F.d3] $.tW=w for(w=y!=null,v=!1,u=0;u<x.length;++u){t=x[u] -s=t.R9 -s=s.iE!==s -if(s){if(t.BN(0)){if(w)y.push([u,t]) +s=J.RE(t) +if(s.gnz(t)){if(s.BN(t)){if(w)y.push([u,t]) v=!0}$.tW.push(t)}}}while(z<1000&&v) if(w&&v){w=$.iU() w.j2("Possible loop in Observable.dirtyCheck, stopped checking.") @@ -11635,77 +11629,59 @@ return this.w3.$1(a)},"$1",null,2,0,null,231,[],"call"], $isEH:true}}],["observe.src.list_diff","package:observe/src/list_diff.dart",,G,{ "^":"", -f6:function(a,b,c,d,e,f){var z,y,x,w,v,u,t,s,r,q,p,o,n,m,l +f6:function(a,b,c,d,e,f){var z,y,x,w,v,u,t,s,r,q,p,o,n,m,l,k z=J.WB(J.xH(f,e),1) y=J.WB(J.xH(c,b),1) if(typeof z!=="number")return H.s(z) x=Array(z) for(w=x.length,v=0;v<z;++v){if(typeof y!=="number")return H.s(y) u=Array(y) +u.fixed$length=init if(v>=w)return H.e(x,v) x[v]=u -if(0>=u.length)return H.e(u,0) +if(0<0||0>=u.length)return H.e(u,0) u[0]=v}if(typeof y!=="number")return H.s(y) t=0 for(;t<y;++t){if(0>=w)return H.e(x,0) -u=x[0] -if(t>=u.length)return H.e(u,t) -u[t]=t}for(u=J.U6(d),s=J.Qc(b),r=J.U6(a),v=1;v<z;++v)for(q=v-1,p=e+v-1,t=1;t<y;++t){o=J.de(u.t(d,p),r.t(a,J.xH(s.g(b,t),1))) +J.kW(x[0],t,t)}for(u=J.U6(d),s=J.Qc(b),r=J.U6(a),v=1;v<z;++v)for(q=v-1,p=e+v-1,t=1;t<y;++t){o=J.de(u.t(d,p),r.t(a,J.xH(s.g(b,t),1))) n=t-1 -m=x[v] -l=x[q] +m=x[q] if(o){if(v>=w)return H.e(x,v) +o=x[v] if(q>=w)return H.e(x,q) -if(n>=l.length)return H.e(l,n) -o=l[n] -if(t>=m.length)return H.e(m,t) -m[t]=o}else{if(q>=w)return H.e(x,q) -if(t>=l.length)return H.e(l,t) -o=l[t] -if(typeof o!=="number")return o.g() +J.kW(o,t,J.UQ(m,n))}else{if(q>=w)return H.e(x,q) +l=J.WB(J.UQ(m,t),1) if(v>=w)return H.e(x,v) -l=m.length -if(n>=l)return H.e(m,n) -n=m[n] -if(typeof n!=="number")return n.g() -n=P.J(o+1,n+1) -if(t>=l)return H.e(m,t) -m[t]=n}}return x}, -Mw:function(a){var z,y,x,w,v,u,t,s,r,q,p,o,n +k=J.WB(J.UQ(x[v],n),1) +J.kW(x[v],t,P.J(l,k))}}return x}, +Mw:function(a){var z,y,x,w,v,u,t,s,r,q,p z=a.length y=z-1 if(0>=z)return H.e(a,0) -x=a[0].length-1 +x=J.xH(J.q8(a[0]),1) if(y<0)return H.e(a,y) -w=a[y] -if(x<0||x>=w.length)return H.e(w,x) -v=w[x] -u=[] -while(!0){if(!(y>0||x>0))break -c$0:{if(y===0){u.push(2);--x -break c$0}if(x===0){u.push(3);--y -break c$0}w=y-1 -if(w<0)return H.e(a,w) -t=a[w] -s=x-1 -r=t.length -if(s<0||s>=r)return H.e(t,s) -q=t[s] -if(x<0||x>=r)return H.e(t,x) -p=t[x] +w=J.UQ(a[y],x) +v=[] +while(!0){if(!(y>0||J.z8(x,0)))break +c$0:{if(y===0){v.push(2) +x=J.xH(x,1) +break c$0}u=J.x(x) +if(u.n(x,0)){v.push(3);--y +break c$0}t=y-1 +if(t<0)return H.e(a,t) +s=J.UQ(a[t],u.W(x,1)) +r=J.UQ(a[t],x) if(y<0)return H.e(a,y) -t=a[y] -if(s>=t.length)return H.e(t,s) -o=t[s] -n=P.J(P.J(p,o),q) -if(n===q){if(q==null?v==null:q===v)u.push(0) -else{u.push(1) -v=q}x=s -y=w}else if(n===p){u.push(3) -v=p -y=w}else{u.push(2) -v=o -x=s}}}return H.VM(new H.iK(u),[null]).br(0)}, +q=J.UQ(a[y],u.W(x,1)) +p=P.J(P.J(r,q),s) +if(p===s){if(J.de(s,w))v.push(0) +else{v.push(1) +w=s}x=u.W(x,1) +y=t}else if(p===r){v.push(3) +w=r +y=t}else{v.push(2) +x=u.W(x,1) +w=q}}}return H.VM(new H.iK(v),[null]).br(0)}, rB:function(a,b,c){var z,y,x for(z=J.U6(a),y=J.U6(b),x=0;x<c;++x)if(!J.de(z.t(a,x),y.t(b,x)))return x return c}, @@ -11781,31 +11757,32 @@ u=new G.DA(y,v,x,z,w) for(t=!1,s=0,r=0;z=a.length,r<z;++r){if(r<0)return H.e(a,r) q=a[r] -q.jr=J.WB(q.jr,s) +q.sjr(J.WB(q.gjr(),s)) if(t)continue z=u.jr y=J.WB(z,J.q8(u.ok.G4)) -x=q.jr -p=P.J(y,J.WB(x,q.dM))-P.y(z,x) +x=J.RE(q) +v=x.gvH(q) +p=P.J(y,J.WB(x.gvH(q),q.gNg()))-P.y(z,v) if(p>=0){C.Nm.KI(a,r);--r -z=J.xH(q.dM,J.q8(q.ok.G4)) +z=J.xH(q.gNg(),J.q8(q.gRt().G4)) if(typeof z!=="number")return H.s(z) s-=z -u.dM=J.WB(u.dM,J.xH(q.dM,p)) -o=J.xH(J.WB(J.q8(u.ok.G4),J.q8(q.ok.G4)),p) +u.dM=J.WB(u.dM,J.xH(q.gNg(),p)) +o=J.xH(J.WB(J.q8(u.ok.G4),J.q8(q.gRt().G4)),p) if(J.de(u.dM,0)&&J.de(o,0))t=!0 -else{n=q.Il -if(J.u6(u.jr,q.jr)){z=u.ok -z=z.Mu(z,0,J.xH(q.jr,u.jr)) +else{n=q.gIl() +if(J.u6(u.jr,x.gvH(q))){z=u.ok +z=z.Mu(z,0,J.xH(x.gvH(q),u.jr)) n.toString if(typeof n!=="object"||n===null||!!n.fixed$length)H.vh(P.f("insertAll")) -H.IC(n,0,z)}if(J.z8(J.WB(u.jr,J.q8(u.ok.G4)),J.WB(q.jr,q.dM))){z=u.ok -J.bj(n,z.Mu(z,J.xH(J.WB(q.jr,q.dM),u.jr),J.q8(u.ok.G4)))}u.Il=n -u.ok=q.ok -if(J.u6(q.jr,u.jr))u.jr=q.jr -t=!1}}else if(J.u6(u.jr,q.jr)){C.Nm.xe(a,r,u);++r +H.IC(n,0,z)}if(J.z8(J.WB(u.jr,J.q8(u.ok.G4)),J.WB(x.gvH(q),q.gNg()))){z=u.ok +J.bj(n,z.Mu(z,J.xH(J.WB(x.gvH(q),q.gNg()),u.jr),J.q8(u.ok.G4)))}u.Il=n +u.ok=q.gok() +if(J.u6(x.gvH(q),u.jr))u.jr=x.gvH(q) +t=!1}}else if(J.u6(u.jr,x.gvH(q))){C.Nm.xe(a,r,u);++r m=J.xH(u.dM,J.q8(u.ok.G4)) -q.jr=J.WB(q.jr,m) +q.sjr(J.WB(q.gjr(),m)) if(typeof m!=="number")return H.s(m) s+=m t=!0}else t=!1}if(!t)a.push(u)}, @@ -11824,7 +11801,7 @@ continue}v=J.RE(w) C.Nm.FV(z,G.jj(a,v.gvH(w),J.WB(v.gvH(w),w.gNg()),w.gIl(),0,J.q8(w.gRt().G4)))}return z}, DA:{ -"^":"a;WA>,ok,Il<,jr,dM", +"^":"a;WA>,ok<,Il<,jr@,dM", gvH:function(a){return this.jr}, gRt:function(){return this.ok}, gNg:function(){return this.dM}, @@ -14594,6 +14571,12 @@ return this.Tn(x).ml(new D.oe(this,w))}v=this.A4.t(0,z.a) if(v!=null)return J.am(v) return this.jU(z.a).ml(new D.kk(z,this))}, +Nw:[function(a,b){return b},"$2","gS6",4,0,75], +b2:function(a){var z,y,x +z=null +try{y=new P.Cf(this.gS6()) +z=P.BS(a,y.gN5())}catch(x){H.Ru(x) +return}return R.Jk(z)}, N7:function(a){var z if(!D.D5(a)){z=P.EF(["type","ServiceException","id","","kind","FormatException","response",a,"message","Top level service responses must be service maps."],null,null) return P.Vu(D.ac(this,R.Jk(z)),null,null)}z=J.U6(a) @@ -14664,14 +14647,13 @@ Ey:{ "^":"Tp:16;a", $1:[function(a){var z,y,x,w -try{x=C.xr.kV(a) -z=R.Jk(x) -x=this.a.N7(z) -return x}catch(w){x=H.Ru(w) -y=x -x=P.EF(["type","ServiceException","id","","kind","DecodeException","response","This is likely a result of a known V8 bug. Although the the bug has been fixed the fix may not be in your Chrome version. For more information see dartbug.com/18385. Observatory is still functioning and you should try your action again.","message","Could not decode JSON: "+H.d(y)],null,null) -x=R.Jk(x) -return P.Vu(D.ac(this.a,x),null,null)}},"$1",null,2,0,null,190,[],"call"], +z=null +try{z=this.a.b2(a)}catch(x){w=H.Ru(x) +y=w +P.JS("Hit V8 bug.") +w=P.EF(["type","ServiceException","id","","kind","DecodeException","response","This is likely a result of a known V8 bug. Although the the bug has been fixed the fix may not be in your Chrome version. For more information see dartbug.com/18385. Observatory is still functioning and you should try your action again.","message","Could not decode JSON: "+H.d(y)],null,null) +w=R.Jk(w) +return P.Vu(D.ac(this.a,w),null,null)}return this.a.N7(z)},"$1",null,2,0,null,190,[],"call"], $isEH:true}, tm:{ "^":"Tp:16;b", @@ -14700,7 +14682,8 @@ $2:function(a,b){J.am(b)}, $isEH:true}, e5:{ -"^":"a;SP,hw<,wZ", +"^":"a;SP<,hw<,wZ", +gaQ:function(){return this.wZ}, Bv:function(a){var z,y,x,w,v z=this.hw H.ed(z,0,a) @@ -15276,7 +15259,7 @@ sNl:[function(a,b){this.ar=F.Wi(this,C.fX,this.ar,b)},null,null,3,0,272,27,[],"script",82], gUE:[function(){return this.MT},null,null,1,0,87,"formattedLine",82,83], sUE:[function(a){this.MT=F.Wi(this,C.oI,this.MT,a)},null,null,3,0,8,27,[],"formattedLine",82], -Nw:[function(){var z,y +c9s:[function(){var z,y z=this.LR y=J.x(z) if(y.n(z,-1))return"N/A" @@ -16941,6 +16924,7 @@ J.KM=function(a,b){return J.U6(a).sB(a,b)} J.Kf=function(a,b){return J.RE(a).WO(a,b)} J.Kv=function(a,b){return J.RE(a).jx(a,b)} +J.Kz=function(a){return J.RE(a).gph(a)} J.L0=function(a,b,c,d,e){return J.w1(a).YW(a,b,c,d,e)} J.LH=function(a,b){return J.w1(a).GT(a,b)} J.LL=function(a){return J.Wx(a).HG(a)} @@ -16953,6 +16937,7 @@ J.MV=function(a,b){return J.RE(a).Ih(a,b)} J.Mu=function(a,b){return J.RE(a).sig(a,b)} J.Mz=function(a){return J.rY(a).hc(a)} +J.NI=function(a){return J.RE(a).gBb(a)} J.Nf=function(a,b){return J.RE(a).syw(a,b)} J.Ng=function(a){return J.RE(a).gxX(a)} J.Nj=function(a,b,c){return J.rY(a).Nj(a,b,c)} @@ -17098,6 +17083,7 @@ J.wp=function(a,b,c,d){return J.w1(a).zB(a,b,c,d)} J.xH=function(a,b){if(typeof a=="number"&&typeof b=="number")return a-b return J.Wx(a).W(a,b)} +J.xP=function(a){return J.RE(a).gT8(a)} J.xR=function(a){return J.RE(a).ghf(a)} J.xq=function(a){return J.RE(a).gUj(a)} J.yO=function(a,b){return J.RE(a).stN(a,b)} @@ -17450,7 +17436,7 @@ C.Of=new H.GD("expander") C.Jt=new H.GD("expanderStyle") C.Yy=new H.GD("expr") -C.Gx=new H.GD("field") +C.IV=new H.GD("field") C.CX=new H.GD("fileAndLine") C.Gd=new H.GD("firstTokenPos") C.Aq=new H.GD("formattedAverage") @@ -17657,7 +17643,7 @@ $.VZ="objects/" $.To=null $.Dq=["A3","A8","AC","AE","AZ","Ar","B2","BN","BT","BX","Ba","Bf","C","C0","C4","Ch","Cp","Cx","D","D3","D6","Dd","E","EX","Ec","Ey","F","FL","FV","FW","Fr","Ft","GB","GG","GT","HG","Hn","Hs","Ic","Id","Ih","Is","J","J2","J3","JG","JP","JV","Ja","Jk","K1","KI","Kb","LI","LV","Ly","Md","Mh","Mi","Ms","Mu","My","NZ","Nj","O","OM","OP","Ob","On","P9","PM","PN","PZ","Pa","Pk","Pv","Q0","QE","Qi","Qx","R3","R4","RB","RC","RR","RU","Rg","Rz","SS","Se","T","TJ","TP","TW","Tc","Tk","Tp","Ty","U","U8","UD","UH","UZ","Uc","V","V1","VD","VH","VI","Vk","Vp","Vr","W","W3","W4","WE","WO","WZ","X6","XG","XU","Xe","Xl","Y","Y9","YF","YI","YS","YU","YW","Yy","Z","Z1","Z2","ZB","ZC","ZF","ZL","ZZ","Ze","Zi","Zv","aA","aC","aD","aJ","aN","an","at","az","b1","b2r","bA","bF","bS","ba","br","bu","cO","cQ","cU","cn","ct","d0","dR","dd","du","eJ","eR","ea","ek","eo","er","es","ev","ez","f1","f6","fZ","fk","fm","g","gA","gAG","gAQ","gAS","gAb","gAn","gAp","gAu","gAy","gB","gB1","gB3","gBJ","gBP","gBV","gBW","gBb","gBs","gBu","gCO","gCY","gCd","gCj","gD5","gD7","gDD","gDe","gE8","gEW","gEh","gEly","gEu","gF1","gFA","gFR","gFZ","gFs","gFw","gG0","gG1","gG3","gG6","gGQ","gGV","gGd","gGe","gHJ","gHX","gHm","gHp","gHq","gI","gID","gIF","gIK","gIO","gIW","gIZ","gIr","gIu","gJ0","gJS","gJf","gJo","gKM","gKU","gKV","gLA","gLF","gLm","gLn","gLx","gM0","gM5","gMB","gMj","gMz","gN","gNF","gNG","gNT","gNW","gNl","gO3","gO9","gOL","gOZ","gOc","gOe","gOh","gOl","gOm","gP","gP1","gPA","gPK","gPL","gPe","gPj","gPl","gPu","gPw","gPy","gQ7","gQG","gQV","gQg","gQl","gQr","gQt","gR","gRA","gRH","gRY","gRn","gRu","gRw","gSB","gSR","gSY4","gSw","gT3","gT8","gTS","gTi","gTq","gU4","gUL","gUQ","gUj","gUo","gUx","gUy","gUz","gV4","gV5","gVE","gVY","gVl","gWA","gX7","gXX","gXc","gXd","gXh","gXt","gXv","gXx","gYe","gZf","ga1","ga3","ga4","gai","gbP","gbY","gcC","gdG","gdQ","gdU","gdW","gdt","ge6","geH","geT","gey","gfN","gfY","gfc","gfg","ghU","ghX","ghf","ghi","gho","gi9","giC","giO","giX","gib","gig","gik","git","giy","gjA","gjG","gjJ","gjL","gjO","gjS","gjT","gjv","gk5","gkF","gkU","gkW","gkc","gkp","gl0","glc","glh","gmC","gmH","gmN","gnc","gng","gnv","gnx","gnz","goE","goM","goY","goc","gor","gox","goy","gp8","gpD","gph","gqO","gqW","gqe","gqn","grM","grU","grZ","grd","grs","grz","gt0","gt5","gt7","gtD","gtH","gtN","gtT","gtY","gtp","gts","gu6","guD","guT","guw","gvH","gvJ","gvt","gwd","gwl","gx","gx8","gxX","gxj","gxr","gxw","gy","gy4","gyG","gyH","gyT","gyX","gys","gyw","gyz","gz1","gzP","gzU","gzW","gzZ","gzf","gzg","gzh","gzj","gzt","h","h8","hZ","hc","hr","hu","i","i4","i5","iM","ii","iw","j","j9","jh","jp","jx","k0","kO","ka","kk","l5","lj","m","m2","m5","mK","n","nC","nH","nN","ni","np","nq","oB","oC","oF","oP","oW","oX","oZ","od","oo","pA","pM","pZ","pj","pr","ps","q1","qA","qC","qEQ","qZ","ql","r6","rJ","rL","rW","ra","rh","sAG","sAQ","sAS","sAb","sAn","sAp","sAu","sAy","sB","sB1","sB3","sBJ","sBP","sBV","sBW","sBb","sBs","sBu","sCO","sCY","sCd","sCj","sDD","sDe","sEW","sEh","sEly","sEu","sF1","sFA","sFR","sFZ","sFs","sFw","sG1","sG3","sG6","sGQ","sGV","sGd","sGe","sHJ","sHX","sHm","sHp","sHq","sID","sIF","sIK","sIO","sIZ","sIr","sIu","sJ0","sJS","sJo","sKM","sKU","sKV","sLA","sLF","sLn","sLx","sM0","sM5","sMB","sMj","sMz","sN","sNF","sNG","sNT","sNW","sNl","sO3","sO9","sOZ","sOc","sOe","sOh","sOl","sOm","sP","sPA","sPK","sPL","sPe","sPj","sPl","sPu","sPw","sPy","sQ7","sQG","sQV","sQl","sQr","sQt","sR","sRA","sRH","sRY","sRn","sRu","sSB","sSY4","sSw","sT3","sT8","sTS","sTi","sTq","sU4","sUL","sUQ","sUo","sUx","sUy","sUz","sV4","sV5","sWA","sX7","sXX","sXc","sXd","sXh","sXt","sXv","sXx","sYe","sa1","sa3","sa4","sai","sbP","sbY","scC","sdG","sdQ","sdU","sdW","sdt","se6","seH","seT","sfN","sfY","sfc","sfg","shU","shX","shf","shi","sho","siC","siX","sib","sig","sik","sit","siy","sjA","sjG","sjJ","sjL","sjO","sjS","sjT","sjv","sk5","skF","skU","skW","skc","skp","slc","slh","smC","smH","smN","snc","sng","snv","snx","soE","soM","soY","soc","sox","soy","sp8","spD","sph","sqO","sqW","sqe","srM","srU","srZ","srd","srs","srz","st0","st5","st7","stD","stN","stT","stY","sts","su6","suD","suT","suw","svH","svJ","svt","swd","sx","sxX","sxj","sxr","sxw","sy","sy4","syG","syH","syT","syX","sys","syw","syz","sz1","szU","szW","szZ","szf","szg","szh","szj","szt","t","tR","tZ","tg","tn","tt","u","u8","uB","uW","vD","vQ","vV","w","wB","wE","wL","wY","wg","x3","xJ","xU","xW","xc","xe","xo","y0","yM","yN","yc","yn","yq","yu","yx","yy","z2","z6","zB","zV","zY","ze"] -$.Au=[C.RP,Z.hx,{created:Z.Co},C.I7,L.bf,{created:L.Rp},C.q0S,H.Dg,{"":H.bu},C.z6Y,Q.Tg,{created:Q.rt},C.J9,R.zMr,{created:R.hp},C.zq,A.Qa,{created:A.JR},C.tf,A.Zt,{created:A.IV},C.qfw,U.qW,{created:U.Wz},C.GTO,A.F1,{created:A.aD},C.wc,A.kn,{created:A.Th},C.Pt,T.ov,{created:T.T5},C.jRs,F.Be,{created:F.Fe},C.Ow,N.oO,{created:N.Zgg},C.xF,Q.NQ,{created:Q.Zo},C.Xb,B.pz,{created:B.t4},C.xz,D.Stq,{created:D.N5},C.aj,U.fI,{created:U.Ry},C.Kh,X.I5,{created:X.cF},C.G4,O.CN,{created:O.On},C.b7,X.uwf,{created:X.bV},C.RcY,A.aQ,{created:A.AJ},C.KJ,N.mk,{created:N.N0},C.X6M,A.jM,{created:A.Sy},C.dUi,Q.Uj,{created:Q.Al},C.U9,D.UL,{created:D.zY},C.HI,H.Pg,{"":H.aR},C.ab,Q.xI,{created:Q.lK},C.lpG,R.LU,{created:R.rA},C.Ch,M.KL,{created:M.Ro},C.OdR,O.pL,{created:O.pn},C.cj,X.E7,{created:X.jD},C.eB,V.F1i,{created:V.fv},C.wE,Z.vj,{created:Z.mA},C.yB,A.Mv,{created:A.Du},C.JW,A.Ww,{created:A.zN},C.qo,K.jY,{created:K.Lz},C.l49,Z.uL,{created:Z.Hx},C.FU,R.lw,{created:R.fR},C.px,A.tz,{created:A.J8},C.epC,Z.Jc,{created:Z.zg},C.Xd,H.b0B,{"":H.UI},C.PF,D.nk,{created:D.dS},C.BP,L.qkb,{created:L.uD},C.Tu,A.xc,{created:A.G7},C.bh,R.i6,{created:R.Hv},C.Bm,A.XP,{created:A.XL},C.wDw,U.SC,{created:U.oH},C.hg,W.hd,{},C.Fv,U.ob,{created:U.zy},C.Wza,B.pR,{created:B.lu},C.leN,R.Lt,{created:R.fL},C.vVv,A.iL,{created:A.lT},C.ri,W.yy,{},C.X0,F.Ir,{created:F.hG},C.R4R,K.xT,{created:K.an}] +$.Au=[C.RP,Z.hx,{created:Z.Co},C.I7,L.bf,{created:L.Rp},C.q0S,H.Dg,{"":H.bu},C.z6Y,Q.Tg,{created:Q.rt},C.J9,R.zMr,{created:R.hp},C.zq,A.Qa,{created:A.JR},C.tf,A.Zt,{created:A.PQ},C.qfw,U.qW,{created:U.Wz},C.GTO,A.F1,{created:A.aD},C.wc,A.kn,{created:A.Th},C.Pt,T.ov,{created:T.T5},C.jRs,F.Be,{created:F.Fe},C.Ow,N.oO,{created:N.Zgg},C.xF,Q.NQ,{created:Q.Zo},C.Xb,B.pz,{created:B.t4},C.xz,D.Stq,{created:D.N5},C.aj,U.fI,{created:U.Ry},C.Kh,X.I5,{created:X.cF},C.G4,O.CN,{created:O.On},C.b7,X.uwf,{created:X.bV},C.RcY,A.aQ,{created:A.AJ},C.KJ,N.mk,{created:N.N0},C.X6M,A.jM,{created:A.Sy},C.dUi,Q.Uj,{created:Q.Al},C.U9,D.UL,{created:D.zY},C.HI,H.Pg,{"":H.aR},C.ab,Q.xI,{created:Q.lK},C.lpG,R.LU,{created:R.rA},C.Ch,M.KL,{created:M.Ro},C.OdR,O.pL,{created:O.pn},C.cj,X.E7,{created:X.jD},C.eB,V.F1i,{created:V.fv},C.wE,Z.vj,{created:Z.mA},C.yB,A.Mv,{created:A.Du},C.JW,A.Ww,{created:A.zN},C.qo,K.jY,{created:K.Lz},C.l49,Z.uL,{created:Z.Hx},C.FU,R.lw,{created:R.fR},C.px,A.tz,{created:A.J8},C.epC,Z.Jc,{created:Z.zg},C.Xd,H.b0B,{"":H.UI},C.PF,D.nk,{created:D.dS},C.BP,L.qkb,{created:L.uD},C.Tu,A.xc,{created:A.G7},C.bh,R.i6,{created:R.Hv},C.Bm,A.XP,{created:A.XL},C.wDw,U.SC,{created:U.oH},C.hg,W.hd,{},C.Fv,U.ob,{created:U.zy},C.Wza,B.pR,{created:B.lu},C.leN,R.Lt,{created:R.fL},C.vVv,A.iL,{created:A.lT},C.ri,W.yy,{},C.X0,F.Ir,{created:F.hG},C.R4R,K.xT,{created:K.an}] I.$lazy($,"globalThis","DX","jk",function(){return function(){return this}()}) I.$lazy($,"globalWindow","cO","C5",function(){return $.jk().window}) I.$lazy($,"globalWorker","zA","Nl",function(){return $.jk().Worker})
diff --git a/runtime/bin/vmservice/client/deployed/web/index_devtools.html_bootstrap.dart.js b/runtime/bin/vmservice/client/deployed/web/index_devtools.html_bootstrap.dart.js index 4a2c2f9..96cd048 100644 --- a/runtime/bin/vmservice/client/deployed/web/index_devtools.html_bootstrap.dart.js +++ b/runtime/bin/vmservice/client/deployed/web/index_devtools.html_bootstrap.dart.js
@@ -1792,7 +1792,8 @@ XL:function(a){var z=this.Rn[2*a+this.hG+3] return init.metadata[z]}, BX:function(a,b){var z=this.Rv -if(J.u6(b,z))return +if(typeof b!=="number")return b.C() +if(b<z)return return this.Rn[3+b-z]}, Fk:function(a){var z=this.Rv if(a<z)return @@ -2343,7 +2344,7 @@ v=w.u8(z,a)+1 w.UZ(z,v,v+y)}}, Kt:{ -"^":"a;ph>,xy<", +"^":"a;ph>,xy", static:{r1:[function(a){return a!=null?J.AG(a):"<null>"},"$1","My",2,0,20]}}, Ni:{ "^":"a;UQ>", @@ -2365,31 +2366,40 @@ tM:[function(a,b){var z,y z=this.zU if(a>>>0!==a||a>=z.length)return H.e(z,a) -y=J.UQ(J.U8(z[a]),b) -z=this.oH +z=J.U8(z[a]) if(b>>>0!==b||b>=9)return H.e(z,b) -return z[b].gxy().$1(y)},"$2","gls",4,0,97,98,[],99,[],"getFormattedValue",82], -Qs:[function(a){var z +y=z[b] +return this.oH[b].xy.$1(y)},"$2","gls",4,0,97,98,[],99,[],"getFormattedValue",82], +Qs:[function(a){var z,y if(!J.de(a,this.pT)){z=this.oH if(a>>>0!==a||a>=9)return H.e(z,a) -return J.WB(J.Kz(z[a]),"\u2003")}z=this.oH +return z[a].ph+"\u2003"}z=this.oH if(a>>>0!==a||a>=9)return H.e(z,a) -z=J.Kz(z[a]) -return J.WB(z,this.jV?"\u25bc":"\u25b2")},"$1","gpo",2,0,18,99,[],"getColumnLabel",82], +z=z[a] +y=this.jV?"\u25bc":"\u25b2" +return z.ph+y},"$1","gpo",2,0,18,99,[],"getColumnLabel",82], TK:[function(a,b){var z=this.zU if(a>>>0!==a||a>=z.length)return H.e(z,a) -return J.UQ(J.U8(z[a]),b)},"$2","gyY",4,0,100,98,[],99,[],"getValue",82]}, +z=J.U8(z[a]) +if(b>>>0!==b||b>=9)return H.e(z,b) +return z[b]},"$2","gyY",4,0,100,98,[],99,[],"getValue",82]}, Nu:{ "^":"Tp:75;a", -$2:function(a,b){var z,y,x,w +$2:function(a,b){var z,y,x,w,v,u z=this.a y=z.zU if(a>>>0!==a||a>=y.length)return H.e(y,a) -x=J.UQ(J.U8(y[a]),z.pT) +x=J.U8(y[a]) +w=z.pT +if(w>>>0!==w||w>=9)return H.e(x,w) +v=x[w] if(b>>>0!==b||b>=y.length)return H.e(y,b) -w=J.UQ(J.U8(y[b]),z.pT) -if(z.jV)return J.oE(w,x) -else return J.oE(x,w)}, +y=J.U8(y[b]) +w=z.pT +if(w>>>0!==w||w>=9)return H.e(y,w) +u=y[w] +if(z.jV)return J.oE(u,v) +else return J.oE(v,u)}, $isEH:true}}],["app_bootstrap","file:///usr/local/google/home/johnmccutchan/workspace/dart-repo/dart/runtime/bin/vmservice/client/web/index_devtools.html_bootstrap.dart",,E,{ "^":"", De:[function(){$.x2=["package:observatory/src/elements/observatory_element.dart","package:observatory/src/elements/nav_bar.dart","package:observatory/src/elements/breakpoint_list.dart","package:observatory/src/elements/service_ref.dart","package:observatory/src/elements/class_ref.dart","package:observatory/src/elements/curly_block.dart","package:observatory/src/elements/instance_ref.dart","package:observatory/src/elements/eval_box.dart","package:observatory/src/elements/eval_link.dart","package:observatory/src/elements/field_ref.dart","package:observatory/src/elements/function_ref.dart","package:observatory/src/elements/library_ref.dart","package:observatory/src/elements/script_ref.dart","package:observatory/src/elements/class_view.dart","package:observatory/src/elements/code_ref.dart","package:observatory/src/elements/code_view.dart","package:observatory/src/elements/collapsible_content.dart","package:observatory/src/elements/error_view.dart","package:observatory/src/elements/field_view.dart","package:observatory/src/elements/script_inset.dart","package:observatory/src/elements/function_view.dart","package:observatory/src/elements/heap_map.dart","package:observatory/src/elements/isolate_ref.dart","package:observatory/src/elements/isolate_summary.dart","package:observatory/src/elements/isolate_view.dart","package:observatory/src/elements/instance_view.dart","package:observatory/src/elements/json_view.dart","package:observatory/src/elements/library_view.dart","package:observatory/src/elements/sliding_checkbox.dart","package:observatory/src/elements/isolate_profile.dart","package:observatory/src/elements/heap_profile.dart","package:observatory/src/elements/script_view.dart","package:observatory/src/elements/stack_frame.dart","package:observatory/src/elements/stack_trace.dart","package:observatory/src/elements/vm_view.dart","package:observatory/src/elements/service_view.dart","package:observatory/src/elements/response_viewer.dart","package:observatory/src/elements/observatory_application.dart","package:observatory/src/elements/service_exception_view.dart","package:observatory/src/elements/service_error_view.dart","package:observatory/src/elements/vm_ref.dart","main.dart"] @@ -2635,10 +2645,9 @@ n3:function(a,b,c){var z for(z=H.VM(new H.a7(a,a.length,0,null),[H.Kp(a,0)]);z.G();)b=c.$2(b,z.lo) return b}, -mx:function(a,b,c){var z,y,x,w -for(y=0;x=$.RM(),y<x.length;++y){x=x[y] -w=a -if(x==null?w==null:x===w)return H.d(b)+"..."+H.d(c)}z=P.p9("") +mx:function(a,b,c){var z,y,x +for(y=0;x=$.RM(),y<x.length;++y)if(x[y]===a)return H.d(b)+"..."+H.d(c) +z=P.p9("") try{$.RM().push(a) z.KF(b) z.We(a,", ") @@ -4235,7 +4244,7 @@ PJ:function(a){var z=$.X3 $.X3=a return z}, -L2:[function(a,b,c,d,e){a.Gr(new P.pK(d,e))},"$5","Gx",10,0,32,33,[],34,[],35,[],30,[],31,[]], +L2:[function(a,b,c,d,e){a.Gr(new P.pK(d,e))},"$5","xP",10,0,32,33,[],34,[],35,[],30,[],31,[]], T8:[function(a,b,c,d){var z,y if(J.de($.X3,c))return d.$0() z=P.PJ(c) @@ -5308,7 +5317,7 @@ $isEH:true}, nU:{ "^":"a;", -gE2:function(){return P.Gx()}, +gE2:function(){return P.xP()}, hk:function(a,b){return this.gE2().$2(a,b)}, gcP:function(){return P.AI()}, Gr:function(a){return this.gcP().$1(a)}, @@ -5375,7 +5384,7 @@ y.We(z,", ") y.KF(")") return y.vM}, -Vr:function(a,b){var z,y,x,w,v,u,t,s,r,q,p +Vr:function(a,b){var z,y,x,w,v,u,t,s,r,q z=a.gA(a) y=0 x=0 @@ -5396,29 +5405,24 @@ for(;z.G();t=s,s=r){r=z.gl();++x if(x>100){while(!0){if(!(y>75&&x>3))break if(0>=b.length)return H.e(b,0) -q=J.WB(J.q8(b.pop()),2) -if(typeof q!=="number")return H.s(q) -y-=q;--x}b.push("...") +y-=b.pop().length+2;--x}b.push("...") return}}u=H.d(t) v=H.d(s) y+=v.length+u.length+4}}if(x>b.length+2){y+=5 -p="..."}else p=null +q="..."}else q=null while(!0){if(!(y>80&&b.length>3))break if(0>=b.length)return H.e(b,0) -q=J.WB(J.q8(b.pop()),2) -if(typeof q!=="number")return H.s(q) -y-=q -if(p==null){y+=5 -p="..."}}if(p!=null)b.push(p) +y-=b.pop().length+2 +if(q==null){y+=5 +q="..."}}if(q!=null)b.push(q) b.push(u) b.push(v)}, L5:function(a,b,c,d,e){return H.VM(new P.YB(0,null,null,null,null,null,0),[d,e])}, Ls:function(a,b,c,d){return H.VM(new P.b6(0,null,null,null,null,null,0),[d])}, -vW:function(a){var z,y,x,w,v +vW:function(a){var z,y,x,w z={} -for(x=0;w=$.tw(),x<w.length;++x){w=w[x] -v=a -if(w==null?v==null:w===v)return"{...}"}y=P.p9("") +for(x=0;w=$.tw(),x<w.length;++x)if(w[x]===a)return"{...}" +y=P.p9("") try{$.tw().push(a) y.KF("{") z.a=!0 @@ -6619,7 +6623,7 @@ return this.Wb(z)}, zw:function(a){var z for(z=this.Jt;a!=null;){z.push(a) -a=J.NI(a)}}, +a=a.Bb}}, G:function(){var z,y,x z=this.Dn if(this.qT!==z.qT)throw H.b(P.a4(z)) @@ -6628,11 +6632,11 @@ return!1}if(z.bb!==this.bb&&this.ya!=null){x=this.ya C.Nm.sB(y,0) if(x==null)this.zw(z.aY) -else{z.vh(J.WI(x)) +else{z.vh(x.G3) this.zw(z.aY.T8)}}if(0>=y.length)return H.e(y,0) z=y.pop() this.ya=z -this.zw(J.xP(z)) +this.zw(z.T8) return!0}, Qf:function(a,b){this.zw(a.aY)}}, OG:{ @@ -6661,17 +6665,17 @@ $isyN:true}, DN:{ "^":"S6B;Dn,Jt,qT,bb,ya", -Wb:function(a){return J.WI(a)}}, +Wb:function(a){return a.G3}}, ZM:{ "^":"S6B;Dn,Jt,qT,bb,ya", -Wb:function(a){return J.Vm(a)}, +Wb:function(a){return a.P}, $asS6B:function(a,b){return[b]}}, HW:{ "^":"S6B;Dn,Jt,qT,bb,ya", Wb:function(a){return a}, $asS6B:function(a){return[[P.qv,a]]}}}],["dart.convert","dart:convert",,P,{ "^":"", -VQ:function(a,b){var z=new P.JC() +VQ:function(a,b){var z=b==null?new P.JC():b return z.$2(null,new P.f1(z).$1(a))}, BS:function(a,b){var z,y,x,w x=a @@ -6715,7 +6719,7 @@ bu:function(a){return"Cyclic error in JSON stringify"}, static:{TP:function(a){return new P.K8(a,null)}}}, by:{ -"^":"Uk;N5,iY", +"^":"Uk;N5<,iY", pW:function(a,b){return P.BS(a,this.gHe().N5)}, kV:function(a){return this.pW(a,null)}, Co:function(a,b){var z=this.gZE() @@ -6728,7 +6732,7 @@ "^":"zF;UM,Xi", $aszF:function(){return[P.a,P.qU]}}, Cf:{ -"^":"zF;N5", +"^":"zF;N5<", $aszF:function(){return[P.qU,P.a]}}, Sh:{ "^":"a;iY,Vy,bV", @@ -7089,7 +7093,7 @@ v=new P.P7().$1(C.CD.JV(y,1000000)) return H.d(C.CD.cU(y,3600000000))+":"+H.d(x)+":"+H.d(w)+"."+H.d(v)}, $isa6:true, -static:{"^":"SF,S4d,pk,LoB,zj5,b2,jS,ll,DoM,f4,za,IJ,iI,Wr,fm,yn",k5:function(a,b,c,d,e,f){return new P.a6(a*86400000000+b*3600000000+e*60000000+f*1000000+d*1000+c)}}}, +static:{"^":"SF,S4d,pk,LoB,zj5,b2,jS,ll,DoM,f4,vd,IJ,iI,Wr,fm,yn",k5:function(a,b,c,d,e,f){return new P.a6(a*86400000000+b*3600000000+e*60000000+f*1000000+d*1000+c)}}}, P7:{ "^":"Tp:18;", $1:function(a){if(a>=100000)return H.d(a) @@ -7374,7 +7378,7 @@ else this.HC=e this.r0=this.x6(c,d)}, $isiD:true, -static:{"^":"n2,q7,tv,ux,vI,IE,fd,IL,yT,zk,yt,fC,O5,FsP,qf,ML,j3,r5,Yk,qs,Fm,WT,t2,H5,zst,LF,ws,Sp,aJ,JA7,HM,SQU,fbQ",hK:function(a1){var z,y,x,w,v,u,t,s,r,q,p,o,n,m,l,k,j,i,h,g,f,e,d,c,b,a,a0 +static:{"^":"n2,q7,tv,ux,vI,IE,fd,IL,yT,zk,yt,fC,O5,FsP,qf,ML,j3,r5,Yk,qs,Fm,WT,t2,H5,zst,LF,ws,Sp,aJ,JA7,HM,za,fbQ",hK:function(a1){var z,y,x,w,v,u,t,s,r,q,p,o,n,m,l,k,j,i,h,g,f,e,d,c,b,a,a0 x=new P.hP() w=new P.Uo(a1) v=J.U6(a1) @@ -7386,7 +7390,7 @@ q=v.j(a1,t) if(q<128){p=q>>>4 if(p>=8)return H.e(C.mK,p) -p=J.mQ(C.mK[p],C.jn.W4(1,q&15))!==0}else p=!1 +p=(C.mK[p]&C.jn.W4(1,q&15))!==0}else p=!1 if(!p){if(q===58){s=r t=s}else{t=r-1 s=0}break}}}else{t=0 @@ -7453,7 +7457,7 @@ if(u)throw H.b(P.u("Illegal scheme: "+a)) if(z.$1(v)!==!0){if(v<128){u=v>>>4 if(u>=8)return H.e(C.mK,u) -u=J.mQ(C.mK[u],C.jn.W4(1,v&15))!==0}else u=!1 +u=(C.mK[u]&C.jn.W4(1,v&15))!==0}else u=!1 if(u);else throw H.b(P.u("Illegal scheme: "+a)) x=!1}}return x?a:a.toLowerCase()},LE:function(a,b){var z,y,x z={} @@ -7555,7 +7559,7 @@ u=J.Wx(v) if(u.C(v,128)){t=u.m(v,4) if(t>=8)return H.e(a,t) -t=J.mQ(a[t],C.jn.W4(1,u.i(v,15)))!==0}else t=!1 +t=(a[t]&C.jn.W4(1,u.i(v,15)))!==0}else t=!1 if(t){u=H.Lw(v) y.vM+=u}else if(d&&u.n(v,32)){u=H.Lw(43) y.vM+=u}else{u=H.Lw(37) @@ -7566,7 +7570,7 @@ $1:function(a){var z if(a<128){z=a>>>4 if(z>=8)return H.e(C.aa,z) -z=J.mQ(C.aa[z],C.jn.W4(1,a&15))!==0}else z=!1 +z=(C.aa[z]&C.jn.W4(1,a&15))!==0}else z=!1 return z}, $isEH:true}, Uo:{ @@ -7580,7 +7584,7 @@ $1:function(a){var z if(a<128){z=a>>>4 if(z>=8)return H.e(C.HE,z) -z=J.mQ(C.HE[z],C.jn.W4(1,a&15))!==0}else z=!1 +z=(C.HE[z]&C.jn.W4(1,a&15))!==0}else z=!1 return z}, $isEH:true}, Kd:{ @@ -7614,7 +7618,7 @@ $1:function(a){var z if(a<128){z=C.jn.GG(a,4) if(z>=8)return H.e(C.kg,z) -z=J.mQ(C.kg[z],C.jn.W4(1,a&15))!==0}else z=!1 +z=(C.kg[z]&C.jn.W4(1,a&15))!==0}else z=!1 return z}, $isEH:true}, wm:{ @@ -9165,12 +9169,15 @@ Up:function(a){a=536870911&a+((67108863&a)<<3>>>0) a^=a>>>11 return 536870911&a+((16383&a)<<15>>>0)}, -J:function(a,b){if(typeof a!=="number")throw H.b(P.u(a)) +J:function(a,b){var z +if(typeof a!=="number")throw H.b(P.u(a)) if(typeof b!=="number")throw H.b(P.u(b)) if(a>b)return b if(a<b)return a if(typeof b==="number"){if(typeof a==="number")if(a===0)return(a+b)*a*b -if(a===0&&C.ON.gzP(b)||C.ON.gG0(b))return b +if(a===0)z=b===0?1/b<0:b<0 +else z=!1 +if(z||isNaN(b))return b return a}return a}, y:function(a,b){if(typeof a!=="number")throw H.b(P.u(a)) if(typeof b!=="number")throw H.b(P.u(b)) @@ -9763,7 +9770,7 @@ if(z===!0)return if(a.bY!=null){a.TS=this.ct(a,C.S4,z,!0) a.oy=this.ct(a,C.UY,a.oy,null) -this.LY(a,a.jv).ml(new R.Ou(a)).YM(new R.tM(a))}},"$3","gDf",6,0,130,53,[],57,[],123,[],"evalNow"], +this.LY(a,a.jv).ml(new R.Kz(a)).YM(new R.Ou(a))}},"$3","gDf",6,0,130,53,[],57,[],123,[],"evalNow"], "@":function(){return[C.Vn]}, static:{fL:[function(a){var z,y,x,w z=$.Nd() @@ -9785,22 +9792,22 @@ Nr:{ "^":"xc+Pi;", $isd3:true}, -Ou:{ +Kz:{ "^":"Tp:86;a-29", $1:[function(a){var z,y z=this.a y=J.RE(z) y.soy(z,y.ct(z,C.UY,y.goy(z),a))},"$1",null,2,0,86,92,[],"call"], $isEH:true}, -"+ Ou":[124], -tM:{ +"+ Kz":[124], +Ou:{ "^":"Tp:22;b-29", $0:[function(){var z,y z=this.b y=J.RE(z) y.sTS(z,y.ct(z,C.S4,y.gTS(z),!1))},"$0",null,0,0,22,"call"], $isEH:true}, -"+ tM":[124]}],["field_ref_element","package:observatory/src/elements/field_ref.dart",,D,{ +"+ Ou":[124]}],["field_ref_element","package:observatory/src/elements/field_ref.dart",,D,{ "^":"", UL:{ "^":["xI;tY-108,Pe-109,AP,fn,AP,fn,dZ,Sa,Uk,oq,Wz,SO,B7,X0-102",null,null,null,null,null,null,null,null,null,null,null,null,null,function(){return[C.Nw]}], @@ -9823,7 +9830,7 @@ jM:{ "^":["pva;vt%-101,AP,fn,AP,fn,dZ,Sa,Uk,oq,Wz,SO,B7,X0-102",null,null,null,null,null,null,null,null,null,null,null,null,function(){return[C.Nw]}], gt0:[function(a){return a.vt},null,null,1,0,103,"field",82,104], -st0:[function(a,b){a.vt=this.ct(a,C.IV,a.vt,b)},null,null,3,0,105,27,[],"field",82], +st0:[function(a,b){a.vt=this.ct(a,C.Gx,a.vt,b)},null,null,3,0,105,27,[],"field",82], pA:[function(a,b){J.am(a.vt).YM(b)},"$1","gvC",2,0,26,106,[],"refresh"], "@":function(){return[C.vc]}, static:{Sy:[function(a){var z,y,x,w @@ -10861,30 +10868,28 @@ v=a.gZ0() for(u=0;u<a.glI().length;++u){y=a.glI() if(u>=y.length)return H.e(y,u) -t=y[u].gSP() +t=y[u].SP s=[] if(t>0){if(typeof v!=="number")return H.s(v) s.push("t "+C.CD.yM(t-v,2))}else s.push("") y=a.glI() if(u>=y.length)return H.e(y,u) -r=y[u].gaQ() +r=y[u].wZ if(r===0){q=0 while(!0){y=a.glI() if(u>=y.length)return H.e(y,u) -y=J.q8(y[u].ghw()) -if(typeof y!=="number")return H.s(y) -if(!(q<y))break +if(!(q<y[u].hw.length))break c$1:{if(q===w)break c$1 s.push(0)}++q}}else{q=0 while(!0){y=a.glI() if(u>=y.length)return H.e(y,u) -y=J.q8(y[u].ghw()) -if(typeof y!=="number")return H.s(y) -if(!(q<y))break +if(!(q<y[u].hw.length))break c$1:{if(q===w)break c$1 y=a.glI() if(u>=y.length)return H.e(y,u) -s.push(C.CD.yu(J.FW(J.UQ(y[u].ghw(),q),r)*100))}++q}}y=[] +y=y[u].hw +if(q>=y.length)return H.e(y,q) +s.push(C.CD.yu(J.FW(y[q],r)*100))}++q}}y=[] C.Nm.FV(y,C.Nm.ez(s,P.En())) y=new P.Tz(y) y.$builtinTypeInfo=[null] @@ -11373,7 +11378,7 @@ grZ:[function(a){return a.Jo},null,null,1,0,126,"last",82,104], srZ:[function(a,b){a.Jo=this.ct(a,C.QL,a.Jo,b)},null,null,3,0,127,27,[],"last",82], "@":function(){return[C.KI]}, -static:{PQ:[function(a){var z,y,x,w +static:{IV:[function(a){var z,y,x,w z=$.Nd() y=P.Py(null,null,null,P.qU,W.I0) x=P.qU @@ -11583,8 +11588,9 @@ w.$builtinTypeInfo=[F.d3] $.tW=w for(w=y!=null,v=!1,u=0;u<x.length;++u){t=x[u] -s=J.RE(t) -if(s.gnz(t)){if(s.BN(t)){if(w)y.push([u,t]) +s=t.R9 +s=s.iE!==s +if(s){if(t.BN(0)){if(w)y.push([u,t]) v=!0}$.tW.push(t)}}}while(z<1000&&v) if(w&&v){w=$.iU() w.j2("Possible loop in Observable.dirtyCheck, stopped checking.") @@ -11629,59 +11635,77 @@ return this.w3.$1(a)},"$1",null,2,0,null,231,[],"call"], $isEH:true}}],["observe.src.list_diff","package:observe/src/list_diff.dart",,G,{ "^":"", -f6:function(a,b,c,d,e,f){var z,y,x,w,v,u,t,s,r,q,p,o,n,m,l,k +f6:function(a,b,c,d,e,f){var z,y,x,w,v,u,t,s,r,q,p,o,n,m,l z=J.WB(J.xH(f,e),1) y=J.WB(J.xH(c,b),1) if(typeof z!=="number")return H.s(z) x=Array(z) for(w=x.length,v=0;v<z;++v){if(typeof y!=="number")return H.s(y) u=Array(y) -u.fixed$length=init if(v>=w)return H.e(x,v) x[v]=u -if(0<0||0>=u.length)return H.e(u,0) +if(0>=u.length)return H.e(u,0) u[0]=v}if(typeof y!=="number")return H.s(y) t=0 for(;t<y;++t){if(0>=w)return H.e(x,0) -J.kW(x[0],t,t)}for(u=J.U6(d),s=J.Qc(b),r=J.U6(a),v=1;v<z;++v)for(q=v-1,p=e+v-1,t=1;t<y;++t){o=J.de(u.t(d,p),r.t(a,J.xH(s.g(b,t),1))) +u=x[0] +if(t>=u.length)return H.e(u,t) +u[t]=t}for(u=J.U6(d),s=J.Qc(b),r=J.U6(a),v=1;v<z;++v)for(q=v-1,p=e+v-1,t=1;t<y;++t){o=J.de(u.t(d,p),r.t(a,J.xH(s.g(b,t),1))) n=t-1 -m=x[q] +m=x[v] +l=x[q] if(o){if(v>=w)return H.e(x,v) -o=x[v] if(q>=w)return H.e(x,q) -J.kW(o,t,J.UQ(m,n))}else{if(q>=w)return H.e(x,q) -l=J.WB(J.UQ(m,t),1) +if(n>=l.length)return H.e(l,n) +o=l[n] +if(t>=m.length)return H.e(m,t) +m[t]=o}else{if(q>=w)return H.e(x,q) +if(t>=l.length)return H.e(l,t) +o=l[t] +if(typeof o!=="number")return o.g() if(v>=w)return H.e(x,v) -k=J.WB(J.UQ(x[v],n),1) -J.kW(x[v],t,P.J(l,k))}}return x}, -Mw:function(a){var z,y,x,w,v,u,t,s,r,q,p +l=m.length +if(n>=l)return H.e(m,n) +n=m[n] +if(typeof n!=="number")return n.g() +n=P.J(o+1,n+1) +if(t>=l)return H.e(m,t) +m[t]=n}}return x}, +Mw:function(a){var z,y,x,w,v,u,t,s,r,q,p,o,n z=a.length y=z-1 if(0>=z)return H.e(a,0) -x=J.xH(J.q8(a[0]),1) +x=a[0].length-1 if(y<0)return H.e(a,y) -w=J.UQ(a[y],x) -v=[] -while(!0){if(!(y>0||J.z8(x,0)))break -c$0:{if(y===0){v.push(2) -x=J.xH(x,1) -break c$0}u=J.x(x) -if(u.n(x,0)){v.push(3);--y -break c$0}t=y-1 -if(t<0)return H.e(a,t) -s=J.UQ(a[t],u.W(x,1)) -r=J.UQ(a[t],x) +w=a[y] +if(x<0||x>=w.length)return H.e(w,x) +v=w[x] +u=[] +while(!0){if(!(y>0||x>0))break +c$0:{if(y===0){u.push(2);--x +break c$0}if(x===0){u.push(3);--y +break c$0}w=y-1 +if(w<0)return H.e(a,w) +t=a[w] +s=x-1 +r=t.length +if(s<0||s>=r)return H.e(t,s) +q=t[s] +if(x<0||x>=r)return H.e(t,x) +p=t[x] if(y<0)return H.e(a,y) -q=J.UQ(a[y],u.W(x,1)) -p=P.J(P.J(r,q),s) -if(p===s){if(J.de(s,w))v.push(0) -else{v.push(1) -w=s}x=u.W(x,1) -y=t}else if(p===r){v.push(3) -w=r -y=t}else{v.push(2) -x=u.W(x,1) -w=q}}}return H.VM(new H.iK(v),[null]).br(0)}, +t=a[y] +if(s>=t.length)return H.e(t,s) +o=t[s] +n=P.J(P.J(p,o),q) +if(n===q){if(q==null?v==null:q===v)u.push(0) +else{u.push(1) +v=q}x=s +y=w}else if(n===p){u.push(3) +v=p +y=w}else{u.push(2) +v=o +x=s}}}return H.VM(new H.iK(u),[null]).br(0)}, rB:function(a,b,c){var z,y,x for(z=J.U6(a),y=J.U6(b),x=0;x<c;++x)if(!J.de(z.t(a,x),y.t(b,x)))return x return c}, @@ -11757,32 +11781,31 @@ u=new G.DA(y,v,x,z,w) for(t=!1,s=0,r=0;z=a.length,r<z;++r){if(r<0)return H.e(a,r) q=a[r] -q.sjr(J.WB(q.gjr(),s)) +q.jr=J.WB(q.jr,s) if(t)continue z=u.jr y=J.WB(z,J.q8(u.ok.G4)) -x=J.RE(q) -v=x.gvH(q) -p=P.J(y,J.WB(x.gvH(q),q.gNg()))-P.y(z,v) +x=q.jr +p=P.J(y,J.WB(x,q.dM))-P.y(z,x) if(p>=0){C.Nm.KI(a,r);--r -z=J.xH(q.gNg(),J.q8(q.gRt().G4)) +z=J.xH(q.dM,J.q8(q.ok.G4)) if(typeof z!=="number")return H.s(z) s-=z -u.dM=J.WB(u.dM,J.xH(q.gNg(),p)) -o=J.xH(J.WB(J.q8(u.ok.G4),J.q8(q.gRt().G4)),p) +u.dM=J.WB(u.dM,J.xH(q.dM,p)) +o=J.xH(J.WB(J.q8(u.ok.G4),J.q8(q.ok.G4)),p) if(J.de(u.dM,0)&&J.de(o,0))t=!0 -else{n=q.gIl() -if(J.u6(u.jr,x.gvH(q))){z=u.ok -z=z.Mu(z,0,J.xH(x.gvH(q),u.jr)) +else{n=q.Il +if(J.u6(u.jr,q.jr)){z=u.ok +z=z.Mu(z,0,J.xH(q.jr,u.jr)) n.toString if(typeof n!=="object"||n===null||!!n.fixed$length)H.vh(P.f("insertAll")) -H.IC(n,0,z)}if(J.z8(J.WB(u.jr,J.q8(u.ok.G4)),J.WB(x.gvH(q),q.gNg()))){z=u.ok -J.bj(n,z.Mu(z,J.xH(J.WB(x.gvH(q),q.gNg()),u.jr),J.q8(u.ok.G4)))}u.Il=n -u.ok=q.gok() -if(J.u6(x.gvH(q),u.jr))u.jr=x.gvH(q) -t=!1}}else if(J.u6(u.jr,x.gvH(q))){C.Nm.xe(a,r,u);++r +H.IC(n,0,z)}if(J.z8(J.WB(u.jr,J.q8(u.ok.G4)),J.WB(q.jr,q.dM))){z=u.ok +J.bj(n,z.Mu(z,J.xH(J.WB(q.jr,q.dM),u.jr),J.q8(u.ok.G4)))}u.Il=n +u.ok=q.ok +if(J.u6(q.jr,u.jr))u.jr=q.jr +t=!1}}else if(J.u6(u.jr,q.jr)){C.Nm.xe(a,r,u);++r m=J.xH(u.dM,J.q8(u.ok.G4)) -q.sjr(J.WB(q.gjr(),m)) +q.jr=J.WB(q.jr,m) if(typeof m!=="number")return H.s(m) s+=m t=!0}else t=!1}if(!t)a.push(u)}, @@ -11801,7 +11824,7 @@ continue}v=J.RE(w) C.Nm.FV(z,G.jj(a,v.gvH(w),J.WB(v.gvH(w),w.gNg()),w.gIl(),0,J.q8(w.gRt().G4)))}return z}, DA:{ -"^":"a;WA>,ok<,Il<,jr@,dM", +"^":"a;WA>,ok,Il<,jr,dM", gvH:function(a){return this.jr}, gRt:function(){return this.ok}, gNg:function(){return this.dM}, @@ -14571,6 +14594,12 @@ return this.Tn(x).ml(new D.oe(this,w))}v=this.A4.t(0,z.a) if(v!=null)return J.am(v) return this.jU(z.a).ml(new D.kk(z,this))}, +Nw:[function(a,b){return b},"$2","gS6",4,0,75], +b2:function(a){var z,y,x +z=null +try{y=new P.Cf(this.gS6()) +z=P.BS(a,y.gN5())}catch(x){H.Ru(x) +return}return R.Jk(z)}, N7:function(a){var z if(!D.D5(a)){z=P.EF(["type","ServiceException","id","","kind","FormatException","response",a,"message","Top level service responses must be service maps."],null,null) return P.Vu(D.ac(this,R.Jk(z)),null,null)}z=J.U6(a) @@ -14641,14 +14670,13 @@ Ey:{ "^":"Tp:16;a", $1:[function(a){var z,y,x,w -try{x=C.xr.kV(a) -z=R.Jk(x) -x=this.a.N7(z) -return x}catch(w){x=H.Ru(w) -y=x -x=P.EF(["type","ServiceException","id","","kind","DecodeException","response","This is likely a result of a known V8 bug. Although the the bug has been fixed the fix may not be in your Chrome version. For more information see dartbug.com/18385. Observatory is still functioning and you should try your action again.","message","Could not decode JSON: "+H.d(y)],null,null) -x=R.Jk(x) -return P.Vu(D.ac(this.a,x),null,null)}},"$1",null,2,0,null,190,[],"call"], +z=null +try{z=this.a.b2(a)}catch(x){w=H.Ru(x) +y=w +P.JS("Hit V8 bug.") +w=P.EF(["type","ServiceException","id","","kind","DecodeException","response","This is likely a result of a known V8 bug. Although the the bug has been fixed the fix may not be in your Chrome version. For more information see dartbug.com/18385. Observatory is still functioning and you should try your action again.","message","Could not decode JSON: "+H.d(y)],null,null) +w=R.Jk(w) +return P.Vu(D.ac(this.a,w),null,null)}return this.a.N7(z)},"$1",null,2,0,null,190,[],"call"], $isEH:true}, tm:{ "^":"Tp:16;b", @@ -14677,8 +14705,7 @@ $2:function(a,b){J.am(b)}, $isEH:true}, e5:{ -"^":"a;SP<,hw<,wZ", -gaQ:function(){return this.wZ}, +"^":"a;SP,hw<,wZ", Bv:function(a){var z,y,x,w,v z=this.hw H.ed(z,0,a) @@ -15254,7 +15281,7 @@ sNl:[function(a,b){this.ar=F.Wi(this,C.fX,this.ar,b)},null,null,3,0,272,27,[],"script",82], gUE:[function(){return this.MT},null,null,1,0,87,"formattedLine",82,83], sUE:[function(a){this.MT=F.Wi(this,C.oI,this.MT,a)},null,null,3,0,8,27,[],"formattedLine",82], -Nw:[function(){var z,y +c9s:[function(){var z,y z=this.LR y=J.x(z) if(y.n(z,-1))return"N/A" @@ -16919,7 +16946,6 @@ J.KM=function(a,b){return J.U6(a).sB(a,b)} J.Kf=function(a,b){return J.RE(a).WO(a,b)} J.Kv=function(a,b){return J.RE(a).jx(a,b)} -J.Kz=function(a){return J.RE(a).gph(a)} J.L0=function(a,b,c,d,e){return J.w1(a).YW(a,b,c,d,e)} J.LH=function(a,b){return J.w1(a).GT(a,b)} J.LL=function(a){return J.Wx(a).HG(a)} @@ -16932,7 +16958,6 @@ J.MV=function(a,b){return J.RE(a).Ih(a,b)} J.Mu=function(a,b){return J.RE(a).sig(a,b)} J.Mz=function(a){return J.rY(a).hc(a)} -J.NI=function(a){return J.RE(a).gBb(a)} J.Nf=function(a,b){return J.RE(a).syw(a,b)} J.Ng=function(a){return J.RE(a).gxX(a)} J.Nj=function(a,b,c){return J.rY(a).Nj(a,b,c)} @@ -17078,7 +17103,6 @@ J.wp=function(a,b,c,d){return J.w1(a).zB(a,b,c,d)} J.xH=function(a,b){if(typeof a=="number"&&typeof b=="number")return a-b return J.Wx(a).W(a,b)} -J.xP=function(a){return J.RE(a).gT8(a)} J.xR=function(a){return J.RE(a).ghf(a)} J.xq=function(a){return J.RE(a).gUj(a)} J.yO=function(a,b){return J.RE(a).stN(a,b)} @@ -17431,7 +17455,7 @@ C.Of=new H.GD("expander") C.Jt=new H.GD("expanderStyle") C.Yy=new H.GD("expr") -C.IV=new H.GD("field") +C.Gx=new H.GD("field") C.CX=new H.GD("fileAndLine") C.Gd=new H.GD("firstTokenPos") C.Aq=new H.GD("formattedAverage") @@ -17638,7 +17662,7 @@ $.VZ="objects/" $.To=null $.Dq=["A3","A8","AC","AE","AZ","Ar","B2","BN","BT","BX","Ba","Bf","C","C0","C4","Ch","Cp","Cx","D","D3","D6","Dd","E","EX","Ec","Ey","F","FL","FV","FW","Fr","Ft","GB","GG","GT","HG","Hn","Hs","Ic","Id","Ih","Is","J","J2","J3","JG","JP","JV","Ja","Jk","K1","KI","Kb","LI","LV","Ly","Md","Mh","Mi","Ms","Mu","My","NZ","Nj","O","OM","OP","Ob","On","P9","PM","PN","PZ","Pa","Pk","Pv","Q0","QE","Qi","Qx","R3","R4","RB","RC","RR","RU","Rg","Rz","SS","Se","T","TJ","TP","TW","Tc","Tk","Tp","Ty","U","U8","UD","UH","UZ","Uc","V","V1","VD","VH","VI","Vk","Vp","Vr","W","W3","W4","WE","WO","WZ","X6","XG","XU","Xe","Xl","Y","Y9","YF","YI","YS","YU","YW","Yy","Z","Z1","Z2","ZB","ZC","ZF","ZL","ZZ","Ze","Zi","Zv","aA","aC","aD","aJ","aN","an","at","az","b1","b2r","bA","bF","bS","ba","br","bu","cO","cQ","cU","cn","ct","d0","dR","dd","du","eJ","eR","ea","ek","eo","er","es","ev","ez","f1","f6","fZ","fk","fm","g","gA","gAG","gAQ","gAS","gAb","gAn","gAp","gAu","gAy","gB","gB1","gB3","gBJ","gBP","gBV","gBW","gBb","gBs","gBu","gCO","gCY","gCd","gCj","gD5","gD7","gDD","gDe","gE8","gEW","gEh","gEly","gEu","gF1","gFA","gFR","gFZ","gFs","gFw","gG0","gG1","gG3","gG6","gGQ","gGV","gGd","gGe","gHJ","gHX","gHm","gHp","gHq","gI","gID","gIF","gIK","gIO","gIW","gIZ","gIr","gIu","gJ0","gJS","gJf","gJo","gKM","gKU","gKV","gLA","gLF","gLm","gLn","gLx","gM0","gM5","gMB","gMj","gMz","gN","gNF","gNG","gNT","gNW","gNl","gO3","gO9","gOL","gOZ","gOc","gOe","gOh","gOl","gOm","gP","gP1","gPA","gPK","gPL","gPe","gPj","gPl","gPu","gPw","gPy","gQ7","gQG","gQV","gQg","gQl","gQr","gQt","gR","gRA","gRH","gRY","gRn","gRu","gRw","gSB","gSR","gSY4","gSw","gT3","gT8","gTS","gTi","gTq","gU4","gUL","gUQ","gUj","gUo","gUx","gUy","gUz","gV4","gV5","gVE","gVY","gVl","gWA","gX7","gXX","gXc","gXd","gXh","gXt","gXv","gXx","gYe","gZf","ga1","ga3","ga4","gai","gbP","gbY","gcC","gdG","gdQ","gdU","gdW","gdt","ge6","geH","geT","gey","gfN","gfY","gfc","gfg","ghU","ghX","ghf","ghi","gho","gi9","giC","giO","giX","gib","gig","gik","git","giy","gjA","gjG","gjJ","gjL","gjO","gjS","gjT","gjv","gk5","gkF","gkU","gkW","gkc","gkp","gl0","glc","glh","gmC","gmH","gmN","gnc","gng","gnv","gnx","gnz","goE","goM","goY","goc","gor","gox","goy","gp8","gpD","gph","gqO","gqW","gqe","gqn","grM","grU","grZ","grd","grs","grz","gt0","gt5","gt7","gtD","gtH","gtN","gtT","gtY","gtp","gts","gu6","guD","guT","guw","gvH","gvJ","gvt","gwd","gwl","gx","gx8","gxX","gxj","gxr","gxw","gy","gy4","gyG","gyH","gyT","gyX","gys","gyw","gyz","gz1","gzP","gzU","gzW","gzZ","gzf","gzg","gzh","gzj","gzt","h","h8","hZ","hc","hr","hu","i","i4","i5","iM","ii","iw","j","j9","jh","jp","jx","k0","kO","ka","kk","l5","lj","m","m2","m5","mK","n","nC","nH","nN","ni","np","nq","oB","oC","oF","oP","oW","oX","oZ","od","oo","pA","pM","pZ","pj","pr","ps","q1","qA","qC","qEQ","qZ","ql","r6","rJ","rL","rW","ra","rh","sAG","sAQ","sAS","sAb","sAn","sAp","sAu","sAy","sB","sB1","sB3","sBJ","sBP","sBV","sBW","sBb","sBs","sBu","sCO","sCY","sCd","sCj","sDD","sDe","sEW","sEh","sEly","sEu","sF1","sFA","sFR","sFZ","sFs","sFw","sG1","sG3","sG6","sGQ","sGV","sGd","sGe","sHJ","sHX","sHm","sHp","sHq","sID","sIF","sIK","sIO","sIZ","sIr","sIu","sJ0","sJS","sJo","sKM","sKU","sKV","sLA","sLF","sLn","sLx","sM0","sM5","sMB","sMj","sMz","sN","sNF","sNG","sNT","sNW","sNl","sO3","sO9","sOZ","sOc","sOe","sOh","sOl","sOm","sP","sPA","sPK","sPL","sPe","sPj","sPl","sPu","sPw","sPy","sQ7","sQG","sQV","sQl","sQr","sQt","sR","sRA","sRH","sRY","sRn","sRu","sSB","sSY4","sSw","sT3","sT8","sTS","sTi","sTq","sU4","sUL","sUQ","sUo","sUx","sUy","sUz","sV4","sV5","sWA","sX7","sXX","sXc","sXd","sXh","sXt","sXv","sXx","sYe","sa1","sa3","sa4","sai","sbP","sbY","scC","sdG","sdQ","sdU","sdW","sdt","se6","seH","seT","sfN","sfY","sfc","sfg","shU","shX","shf","shi","sho","siC","siX","sib","sig","sik","sit","siy","sjA","sjG","sjJ","sjL","sjO","sjS","sjT","sjv","sk5","skF","skU","skW","skc","skp","slc","slh","smC","smH","smN","snc","sng","snv","snx","soE","soM","soY","soc","sox","soy","sp8","spD","sph","sqO","sqW","sqe","srM","srU","srZ","srd","srs","srz","st0","st5","st7","stD","stN","stT","stY","sts","su6","suD","suT","suw","svH","svJ","svt","swd","sx","sxX","sxj","sxr","sxw","sy","sy4","syG","syH","syT","syX","sys","syw","syz","sz1","szU","szW","szZ","szf","szg","szh","szj","szt","t","tR","tZ","tg","tn","tt","u","u8","uB","uW","vD","vQ","vV","w","wB","wE","wL","wY","wg","x3","xJ","xU","xW","xc","xe","xo","y0","yM","yN","yc","yn","yq","yu","yx","yy","z2","z6","zB","zV","zY","ze"] -$.Au=[C.RP,Z.hx,{created:Z.Co},C.I7,L.bf,{created:L.Rp},C.q0S,H.Dg,{"":H.bu},C.z6Y,Q.Tg,{created:Q.rt},C.J9,R.zMr,{created:R.hp},C.zq,A.Qa,{created:A.JR},C.tf,A.Zt,{created:A.PQ},C.qfw,U.qW,{created:U.Wz},C.GTO,A.F1,{created:A.aD},C.wc,A.kn,{created:A.Th},C.Pt,T.ov,{created:T.T5},C.jRs,F.Be,{created:F.Fe},C.Ow,N.oO,{created:N.Zgg},C.xF,Q.NQ,{created:Q.Zo},C.Xb,B.pz,{created:B.t4},C.xz,D.Stq,{created:D.N5},C.aj,U.fI,{created:U.Ry},C.Kh,X.I5,{created:X.cF},C.G4,O.CN,{created:O.On},C.b7,X.uwf,{created:X.bV},C.RcY,A.aQ,{created:A.AJ},C.KJ,N.mk,{created:N.N0},C.X6M,A.jM,{created:A.Sy},C.dUi,Q.Uj,{created:Q.Al},C.U9,D.UL,{created:D.zY},C.HI,H.Pg,{"":H.aR},C.ab,Q.xI,{created:Q.lK},C.lpG,R.LU,{created:R.rA},C.Ch,M.KL,{created:M.Ro},C.OdR,O.pL,{created:O.pn},C.cj,X.E7,{created:X.jD},C.eB,V.F1i,{created:V.fv},C.wE,Z.vj,{created:Z.mA},C.yB,A.Mv,{created:A.Du},C.JW,A.Ww,{created:A.zN},C.qo,K.jY,{created:K.Lz},C.l49,Z.uL,{created:Z.Hx},C.FU,R.lw,{created:R.fR},C.px,A.tz,{created:A.J8},C.epC,Z.Jc,{created:Z.zg},C.Xd,H.b0B,{"":H.UI},C.PF,D.nk,{created:D.dS},C.BP,L.qkb,{created:L.uD},C.Tu,A.xc,{created:A.G7},C.bh,R.i6,{created:R.Hv},C.Bm,A.XP,{created:A.XL},C.wDw,U.SC,{created:U.oH},C.hg,W.hd,{},C.Fv,U.ob,{created:U.zy},C.Wza,B.pR,{created:B.lu},C.leN,R.Lt,{created:R.fL},C.vVv,A.iL,{created:A.lT},C.ri,W.yy,{},C.X0,F.Ir,{created:F.hG},C.R4R,K.xT,{created:K.an}] +$.Au=[C.RP,Z.hx,{created:Z.Co},C.I7,L.bf,{created:L.Rp},C.q0S,H.Dg,{"":H.bu},C.z6Y,Q.Tg,{created:Q.rt},C.J9,R.zMr,{created:R.hp},C.zq,A.Qa,{created:A.JR},C.tf,A.Zt,{created:A.IV},C.qfw,U.qW,{created:U.Wz},C.GTO,A.F1,{created:A.aD},C.wc,A.kn,{created:A.Th},C.Pt,T.ov,{created:T.T5},C.jRs,F.Be,{created:F.Fe},C.Ow,N.oO,{created:N.Zgg},C.xF,Q.NQ,{created:Q.Zo},C.Xb,B.pz,{created:B.t4},C.xz,D.Stq,{created:D.N5},C.aj,U.fI,{created:U.Ry},C.Kh,X.I5,{created:X.cF},C.G4,O.CN,{created:O.On},C.b7,X.uwf,{created:X.bV},C.RcY,A.aQ,{created:A.AJ},C.KJ,N.mk,{created:N.N0},C.X6M,A.jM,{created:A.Sy},C.dUi,Q.Uj,{created:Q.Al},C.U9,D.UL,{created:D.zY},C.HI,H.Pg,{"":H.aR},C.ab,Q.xI,{created:Q.lK},C.lpG,R.LU,{created:R.rA},C.Ch,M.KL,{created:M.Ro},C.OdR,O.pL,{created:O.pn},C.cj,X.E7,{created:X.jD},C.eB,V.F1i,{created:V.fv},C.wE,Z.vj,{created:Z.mA},C.yB,A.Mv,{created:A.Du},C.JW,A.Ww,{created:A.zN},C.qo,K.jY,{created:K.Lz},C.l49,Z.uL,{created:Z.Hx},C.FU,R.lw,{created:R.fR},C.px,A.tz,{created:A.J8},C.epC,Z.Jc,{created:Z.zg},C.Xd,H.b0B,{"":H.UI},C.PF,D.nk,{created:D.dS},C.BP,L.qkb,{created:L.uD},C.Tu,A.xc,{created:A.G7},C.bh,R.i6,{created:R.Hv},C.Bm,A.XP,{created:A.XL},C.wDw,U.SC,{created:U.oH},C.hg,W.hd,{},C.Fv,U.ob,{created:U.zy},C.Wza,B.pR,{created:B.lu},C.leN,R.Lt,{created:R.fL},C.vVv,A.iL,{created:A.lT},C.ri,W.yy,{},C.X0,F.Ir,{created:F.hG},C.R4R,K.xT,{created:K.an}] I.$lazy($,"globalThis","DX","jk",function(){return function(){return this}()}) I.$lazy($,"globalWindow","cO","C5",function(){return $.jk().window}) I.$lazy($,"globalWorker","zA","Nl",function(){return $.jk().Worker})
diff --git a/runtime/bin/vmservice/client/lib/src/service/object.dart b/runtime/bin/vmservice/client/lib/src/service/object.dart index a94a706..0a8e54d 100644 --- a/runtime/bin/vmservice/client/lib/src/service/object.dart +++ b/runtime/bin/vmservice/client/lib/src/service/object.dart
@@ -284,6 +284,21 @@ }); } + dynamic _reviver(dynamic key, dynamic value) { + return value; + } + + ObservableMap _parseJSON(String response) { + var map; + try { + var decoder = new JsonDecoder(_reviver); + map = decoder.convert(response); + } catch (e, st) { + return null; + } + return toObservable(map); + } + Future<ObservableMap> _processMap(ObservableMap map) { // Verify that the top level response is a service map. if (!_isServiceMap(map)) { @@ -306,30 +321,35 @@ return new Future.value(map); } + Future<ObservableMap> _decodeError(e) { + return new Future.error(new ServiceObject._fromMap(this, toObservable({ + 'type': 'ServiceException', + 'id': '', + 'kind': 'DecodeException', + 'response': + 'This is likely a result of a known V8 bug. Although the ' + 'the bug has been fixed the fix may not be in your Chrome' + ' version. For more information see dartbug.com/18385. ' + 'Observatory is still functioning and you should try your' + ' action again.', + 'message': 'Could not decode JSON: $e', + }))); + } + /// Gets [id] as an [ObservableMap] from the service directly. If /// an error occurs, the future is completed as an error with a /// ServiceError or ServiceException. Therefore any chained then() calls /// will only receive a map encoding a valid ServiceObject. Future<ObservableMap> getAsMap(String id) { return getString(id).then((response) { + var map; try { - var map = toObservable(JSON.decode(response)); - return _processMap(map); + map = _parseJSON(response); } catch (e, st) { - return new Future.error( - new ServiceObject._fromMap(this, toObservable({ - 'type': 'ServiceException', - 'id': '', - 'kind': 'DecodeException', - 'response': - 'This is likely a result of a known V8 bug. Although the ' - 'the bug has been fixed the fix may not be in your Chrome' - ' version. For more information see dartbug.com/18385. ' - 'Observatory is still functioning and you should try your' - ' action again.', - 'message': 'Could not decode JSON: $e', - }))); + print('Hit V8 bug.'); + return _decodeError(e); } + return _processMap(map); }).catchError((error) { // ServiceError, forward to VM's ServiceError stream. errors.add(error);
diff --git a/runtime/vm/flow_graph_builder.cc b/runtime/vm/flow_graph_builder.cc index 8d937f2..181ca41 100644 --- a/runtime/vm/flow_graph_builder.cc +++ b/runtime/vm/flow_graph_builder.cc
@@ -1037,11 +1037,6 @@ // <Expression> ::= Literal { literal: Instance } void EffectGraphVisitor::VisitLiteralNode(LiteralNode* node) { - return; -} - - -void ValueGraphVisitor::VisitLiteralNode(LiteralNode* node) { ReturnDefinition(new ConstantInstr(node->literal())); } @@ -1423,28 +1418,6 @@ ReturnDefinition(new ConstantInstr(Bool::Get(!negate_result))); return; } - - // Eliminate the test if it can be performed successfully at compile time. - if ((node->left() != NULL) && - node->left()->IsLiteralNode() && - type.IsInstantiated()) { - const Instance& literal_value = node->left()->AsLiteralNode()->literal(); - ConstantInstr* result = NULL; - - Error& malformed_error = Error::Handle(); - if (literal_value.IsInstanceOf(type, - TypeArguments::Handle(), - &malformed_error)) { - result = new ConstantInstr(Bool::Get(!negate_result)); - } else { - result = new ConstantInstr(Bool::Get(negate_result)); - } - ASSERT(malformed_error.IsNull()); - - ReturnDefinition(result); - return; - } - ValueGraphVisitor for_left_value(owner()); node->left()->Visit(&for_left_value); Append(for_left_value);
diff --git a/runtime/vm/flow_graph_builder.h b/runtime/vm/flow_graph_builder.h index 3ec5db9..78ccc09 100644 --- a/runtime/vm/flow_graph_builder.h +++ b/runtime/vm/flow_graph_builder.h
@@ -452,7 +452,11 @@ // Specify a definition of the final result. Adds the definition to // the graph, but normally overridden in subclasses. virtual void ReturnDefinition(Definition* definition) { - Do(definition); + // Constants have no effect, do not add them to graph otherwise SSA + // builder will get confused. + if (!definition->IsConstant()) { + Do(definition); + } } // Shared global state. @@ -475,7 +479,6 @@ : EffectGraphVisitor(owner), value_(NULL) { } // Visit functions overridden by this class. - virtual void VisitLiteralNode(LiteralNode* node); virtual void VisitAssignableNode(AssignableNode* node); virtual void VisitConstructorCallNode(ConstructorCallNode* node); virtual void VisitBinaryOpNode(BinaryOpNode* node);
diff --git a/tests/language/language_analyzer.status b/tests/language/language_analyzer.status index cb09358..0332d8d 100644 --- a/tests/language/language_analyzer.status +++ b/tests/language/language_analyzer.status
@@ -459,19 +459,21 @@ # Issue 18562- 'is', 'as' and 'catch' aren't type annotations, thus we don't # generate the "The deferred types cannot be used in a declaration" warning -#deferred_constraints_type_annotation_test/as_operation: MissingStaticWarning -#deferred_constraints_type_annotation_test/is_check: MissingStaticWarning -#deferred_constraints_type_annotation_test/catch_check: MissingStaticWarning +deferred_constraints_type_annotation_test/as_operation: MissingStaticWarning +deferred_constraints_type_annotation_test/is_check: MissingStaticWarning +deferred_constraints_type_annotation_test/catch_check: MissingStaticWarning +# The following lines have been left in to quickly switch back to having deferred loading +# off by default again. # Deferred loading support, tests marked as failing until support is enabled by default. -deferred_closurize_load_library_test: Pass, Fail -deferred_not_loaded_check_test/*: Pass, Fail -deferred_shadow_load_library_test: Pass, Fail -deferred_constraints_constants_test/*: Pass, Fail -deferred_load_library_wrong_args_test/*: Pass, Fail -deferred_constraints_type_annotation_test/*: Pass, Fail -deferred_load_inval_code_test: Pass, Fail -deferred_not_loaded_check_test: Pass, Fail +#deferred_closurize_load_library_test: Pass, Fail +#deferred_not_loaded_check_test/*: Pass, Fail +#deferred_shadow_load_library_test: Pass, Fail +#deferred_constraints_constants_test/*: Pass, Fail +#deferred_load_library_wrong_args_test/*: Pass, Fail +#deferred_constraints_type_annotation_test/*: Pass, Fail +#deferred_load_inval_code_test: Pass, Fail +#deferred_not_loaded_check_test: Pass, Fail # Issues to be fixed now that type parameters have been fixed # (issues 14221, 15553)
diff --git a/tools/VERSION b/tools/VERSION index ed7eba2..d960607 100644 --- a/tools/VERSION +++ b/tools/VERSION
@@ -28,4 +28,4 @@ MINOR 4 PATCH 0 PRERELEASE 6 -PRERELEASE_PATCH 0 +PRERELEASE_PATCH 1