<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[218316] trunk/Source/JavaScriptCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/218316">218316</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2017-06-14 22:57:27 -0700 (Wed, 14 Jun 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Cocoa] Objective-C class whose name begins with an underscore can’t be exported to JavaScript
https://bugs.webkit.org/show_bug.cgi?id=168578

Reviewed by Geoff Garen.

* API/JSWrapperMap.mm:
(allocateConstructorForCustomClass): Updated for change to forEachProtocolImplementingProtocol.
(-[JSObjCClassInfo allocateConstructorAndPrototype]): Ditto.
(-[JSWrapperMap classInfoForClass:]): If the class name begins with an underscore, check if
  it defines conformance to a JSExport-derived protocol and if so, avoid using the
  superclass as a substitute as we’d normally do.

* API/ObjcRuntimeExtras.h:
(forEachProtocolImplementingProtocol): Added a "stop" argument to the block to let callers
  bail out.

* API/tests/JSExportTests.mm:
(+[JSExportTests classNamePrefixedWithUnderscoreTest]): New test for this.
(runJSExportTests): Run new test.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIJSWrapperMapmm">trunk/Source/JavaScriptCore/API/JSWrapperMap.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIObjcRuntimeExtrash">trunk/Source/JavaScriptCore/API/ObjcRuntimeExtras.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPItestsJSExportTestsmm">trunk/Source/JavaScriptCore/API/tests/JSExportTests.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIJSWrapperMapmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSWrapperMap.mm (218315 => 218316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSWrapperMap.mm  2017-06-15 05:38:50 UTC (rev 218315)
+++ trunk/Source/JavaScriptCore/API/JSWrapperMap.mm     2017-06-15 05:57:27 UTC (rev 218316)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2015, 2017 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -412,7 +412,7 @@
</span><span class="cx">     __block HashMap<String, Protocol *> initTable;
</span><span class="cx">     Protocol *exportProtocol = getJSExportProtocol();
</span><span class="cx">     for (Class currentClass = cls; currentClass; currentClass = class_getSuperclass(currentClass)) {
</span><del>-        forEachProtocolImplementingProtocol(currentClass, exportProtocol, ^(Protocol *protocol) {
</del><ins>+        forEachProtocolImplementingProtocol(currentClass, exportProtocol, ^(Protocol *protocol, bool&) {
</ins><span class="cx">             forEachMethodInProtocol(protocol, YES, YES, ^(SEL selector, const char*) {
</span><span class="cx">                 const char* name = sel_getName(selector);
</span><span class="cx">                 if (!isInitFamilyMethod(@(name)))
</span><span class="lines">@@ -490,7 +490,7 @@
</span><span class="cx">         putNonEnumerable(constructor, @"prototype", prototype);
</span><span class="cx"> 
</span><span class="cx">         Protocol *exportProtocol = getJSExportProtocol();
</span><del>-        forEachProtocolImplementingProtocol(m_class, exportProtocol, ^(Protocol *protocol){
</del><ins>+        forEachProtocolImplementingProtocol(m_class, exportProtocol, ^(Protocol *protocol, bool&){
</ins><span class="cx">             copyPrototypeProperties(context, m_class, protocol, prototype);
</span><span class="cx">             copyMethodsToObject(context, m_class, protocol, NO, constructor);
</span><span class="cx">         });
</span><span class="lines">@@ -587,9 +587,17 @@
</span><span class="cx">         return classInfo;
</span><span class="cx"> 
</span><span class="cx">     // Skip internal classes beginning with '_' - just copy link to the parent class's info.
</span><del>-    if ('_' == *class_getName(cls))
-        return m_classMap[cls] = [self classInfoForClass:class_getSuperclass(cls)];
</del><ins>+    if ('_' == *class_getName(cls)) {
+        bool conformsToExportProtocol = false;
+        forEachProtocolImplementingProtocol(cls, getJSExportProtocol(), [&conformsToExportProtocol](Protocol *, bool& stop) {
+            conformsToExportProtocol = true;
+            stop = true;
+        });
</ins><span class="cx"> 
</span><ins>+        if (!conformsToExportProtocol)
+            return m_classMap[cls] = [self classInfoForClass:class_getSuperclass(cls)];
+    }
+
</ins><span class="cx">     return m_classMap[cls] = [[[JSObjCClassInfo alloc] initForClass:cls] autorelease];
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIObjcRuntimeExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/ObjcRuntimeExtras.h (218315 => 218316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/ObjcRuntimeExtras.h      2017-06-15 05:38:50 UTC (rev 218315)
+++ trunk/Source/JavaScriptCore/API/ObjcRuntimeExtras.h 2017-06-15 05:57:27 UTC (rev 218316)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2017 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-inline void forEachProtocolImplementingProtocol(Class cls, Protocol *target, void (^callback)(Protocol *))
</del><ins>+inline void forEachProtocolImplementingProtocol(Class cls, Protocol *target, void (^callback)(Protocol *, bool& stop))
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(cls);
</span><span class="cx">     ASSERT(target);
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx">     worklist.append(protocols, protocolsCount);
</span><span class="cx">     free(protocols);
</span><span class="cx"> 
</span><ins>+    bool stop = false;
</ins><span class="cx">     while (!worklist.isEmpty()) {
</span><span class="cx">         Protocol *protocol = worklist.last();
</span><span class="cx">         worklist.removeLast();
</span><span class="lines">@@ -65,8 +66,11 @@
</span><span class="cx">             continue;
</span><span class="cx"> 
</span><span class="cx">         // If it implements the protocol, make the callback.
</span><del>-        if (protocolImplementsProtocol(protocol, target))
-            callback(protocol);
</del><ins>+        if (protocolImplementsProtocol(protocol, target)) {
+            callback(protocol, stop);
+            if (stop)
+                break;
+        }
</ins><span class="cx"> 
</span><span class="cx">         // Add incorporated protocols to the worklist.
</span><span class="cx">         protocols = protocol_copyProtocolList(protocol, &protocolsCount);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPItestsJSExportTestsmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/tests/JSExportTests.mm (218315 => 218316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/tests/JSExportTests.mm   2017-06-15 05:38:50 UTC (rev 218315)
+++ trunk/Source/JavaScriptCore/API/tests/JSExportTests.mm      2017-06-15 05:57:27 UTC (rev 218316)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2017 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -80,6 +80,28 @@
</span><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx"> 
</span><ins>+@interface NoUnderscorePrefix : NSObject
+@end
+
+@implementation NoUnderscorePrefix
+@end
+
+@interface _UnderscorePrefixNoExport : NoUnderscorePrefix
+@end
+
+@implementation _UnderscorePrefixNoExport
+@end
+
+@protocol Initializing <JSExport>
+- (instancetype)init;
+@end
+
+@interface _UnderscorePrefixWithExport : NoUnderscorePrefix <Initializing>
+@end
+
+@implementation _UnderscorePrefixWithExport
+@end
+
</ins><span class="cx"> @implementation JSExportTests
</span><span class="cx"> + (void) exportInstanceMethodWithIdProtocolTest
</span><span class="cx"> {
</span><span class="lines">@@ -123,6 +145,21 @@
</span><span class="cx">     JSValue *value = [context evaluateScript:@"myString.boolValue()"];
</span><span class="cx">     checkResult(@"Dynamically generated JSExport-ed protocols are ignored", [value isUndefined] && !!context.exception);
</span><span class="cx"> }
</span><ins>+
++ (void)classNamePrefixedWithUnderscoreTest
+{
+    JSContext *context = [[JSContext alloc] init];
+
+    context[@"_UnderscorePrefixNoExport"] = [_UnderscorePrefixNoExport class];
+    context[@"_UnderscorePrefixWithExport"] = [_UnderscorePrefixWithExport class];
+
+    checkResult(@"Non-underscore-prefixed ancestor class used when there are no exports", [context[@"_UnderscorePrefixNoExport"] toObject] == [NoUnderscorePrefix class]);
+    checkResult(@"Underscore-prefixed class used when there are exports", [context[@"_UnderscorePrefixWithExport"] toObject] == [_UnderscorePrefixWithExport class]);
+
+    JSValue *withExportInstance = [context evaluateScript:@"new _UnderscorePrefixWithExport()"];
+    checkResult(@"Exports present on underscore-prefixed class", !context.exception && !withExportInstance.isUndefined);
+}
+
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> @protocol AJSExport <JSExport>
</span><span class="lines">@@ -171,6 +208,7 @@
</span><span class="cx">         [JSExportTests exportInstanceMethodWithIdProtocolTest];
</span><span class="cx">         [JSExportTests exportInstanceMethodWithClassProtocolTest];
</span><span class="cx">         [JSExportTests exportDynamicallyGeneratedProtocolTest];
</span><ins>+        [JSExportTests classNamePrefixedWithUnderscoreTest];
</ins><span class="cx">     }
</span><span class="cx">     wrapperLifetimeIsTiedToGlobalObject();
</span><span class="cx">     wrapperForNSObjectisObject();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (218315 => 218316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2017-06-15 05:38:50 UTC (rev 218315)
+++ trunk/Source/JavaScriptCore/ChangeLog       2017-06-15 05:57:27 UTC (rev 218316)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2017-06-14  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Objective-C class whose name begins with an underscore can’t be exported to JavaScript
+        https://bugs.webkit.org/show_bug.cgi?id=168578
+
+        Reviewed by Geoff Garen.
+
+        * API/JSWrapperMap.mm:
+        (allocateConstructorForCustomClass): Updated for change to forEachProtocolImplementingProtocol.
+        (-[JSObjCClassInfo allocateConstructorAndPrototype]): Ditto.
+        (-[JSWrapperMap classInfoForClass:]): If the class name begins with an underscore, check if
+          it defines conformance to a JSExport-derived protocol and if so, avoid using the
+          superclass as a substitute as we’d normally do.
+
+        * API/ObjcRuntimeExtras.h:
+        (forEachProtocolImplementingProtocol): Added a "stop" argument to the block to let callers
+          bail out.
+
+        * API/tests/JSExportTests.mm:
+        (+[JSExportTests classNamePrefixedWithUnderscoreTest]): New test for this.
+        (runJSExportTests): Run new test.
+
</ins><span class="cx"> 2017-06-14  Yusuke Suzuki  <utatane.tea@gmail.com>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, suppress invalid register alloation validation assertion in 32 bit part 2
</span></span></pre>
</div>
</div>

</body>
</html>