Title: [149850] trunk/Source/_javascript_Core
- Revision
- 149850
- Author
- [email protected]
- Date
- 2013-05-09 15:40:44 -0700 (Thu, 09 May 2013)
Log Message
Unreviewed build fix after r149836.
It broke at least EFL and GTK builds. Move new static members initialization
outside the class. Those need to have a definition outside the class because
their address is used (e.g. CodeCacheMap::nonGlobalWorkingSetMaxEntries).
* runtime/CodeCache.cpp:
(JSC):
* runtime/CodeCache.h:
(CodeCacheMap):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (149849 => 149850)
--- trunk/Source/_javascript_Core/ChangeLog 2013-05-09 22:39:21 UTC (rev 149849)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-05-09 22:40:44 UTC (rev 149850)
@@ -1,3 +1,16 @@
+2013-05-09 Christophe Dumez <[email protected]>
+
+ Unreviewed build fix after r149836.
+
+ It broke at least EFL and GTK builds. Move new static members initialization
+ outside the class. Those need to have a definition outside the class because
+ their address is used (e.g. CodeCacheMap::nonGlobalWorkingSetMaxEntries).
+
+ * runtime/CodeCache.cpp:
+ (JSC):
+ * runtime/CodeCache.h:
+ (CodeCacheMap):
+
2013-05-08 Oliver Hunt <[email protected]>
Code cache stores bogus var references for functions in eval code
Modified: trunk/Source/_javascript_Core/runtime/CodeCache.cpp (149849 => 149850)
--- trunk/Source/_javascript_Core/runtime/CodeCache.cpp 2013-05-09 22:39:21 UTC (rev 149849)
+++ trunk/Source/_javascript_Core/runtime/CodeCache.cpp 2013-05-09 22:40:44 UTC (rev 149850)
@@ -37,6 +37,11 @@
namespace JSC {
const double CodeCacheMap::workingSetTime = 10.0;
+const int64_t CodeCacheMap::globalWorkingSetMaxBytes = 16000000;
+const size_t CodeCacheMap::globalWorkingSetMaxEntries = 2000;
+const unsigned CodeCacheMap::nonGlobalWorkingSetScale = 20;
+const int64_t CodeCacheMap::nonGlobalWorkingSetMaxBytes = CodeCacheMap::globalWorkingSetMaxBytes / CodeCacheMap::nonGlobalWorkingSetScale;
+const size_t CodeCacheMap::nonGlobalWorkingSetMaxEntries = CodeCacheMap::globalWorkingSetMaxEntries / CodeCacheMap::nonGlobalWorkingSetScale;
void CodeCacheMap::pruneSlowCase()
{
Modified: trunk/Source/_javascript_Core/runtime/CodeCache.h (149849 => 149850)
--- trunk/Source/_javascript_Core/runtime/CodeCache.h 2013-05-09 22:39:21 UTC (rev 149849)
+++ trunk/Source/_javascript_Core/runtime/CodeCache.h 2013-05-09 22:40:44 UTC (rev 149850)
@@ -194,15 +194,15 @@
int64_t age() { return m_age; }
- static const int64_t globalWorkingSetMaxBytes = 16000000;
- static const size_t globalWorkingSetMaxEntries = 2000;
+ static const int64_t globalWorkingSetMaxBytes;
+ static const size_t globalWorkingSetMaxEntries;
// We have a smaller cap for the per-codeblock CodeCache that approximates the
// linked EvalCodeCache limits, but still allows us to keep large string based
// evals at least partially cached.
- static const unsigned nonGlobalWorkingSetScale = 20;
- static const int64_t nonGlobalWorkingSetMaxBytes = globalWorkingSetMaxBytes / nonGlobalWorkingSetScale;
- static const size_t nonGlobalWorkingSetMaxEntries = globalWorkingSetMaxEntries / nonGlobalWorkingSetScale;
+ static const unsigned nonGlobalWorkingSetScale;
+ static const int64_t nonGlobalWorkingSetMaxBytes;
+ static const size_t nonGlobalWorkingSetMaxEntries;
private:
// This constant factor biases cache capacity toward allowing a minimum
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
