Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(70)

Unified Diff: compiler/java/com/google/dart/compiler/resolver/ResolutionContext.java

Issue 10516006: Issue 3268. Support for replacing 'assert' statement with 'assert' function (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Changes for review comments Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: compiler/java/com/google/dart/compiler/resolver/ResolutionContext.java
diff --git a/compiler/java/com/google/dart/compiler/resolver/ResolutionContext.java b/compiler/java/com/google/dart/compiler/resolver/ResolutionContext.java
index c199c828190c67cd948f2fa3fb4db88923ad795e..e5aa3f8d66cdfd575bc43e1737044e16594eb610 100644
--- a/compiler/java/com/google/dart/compiler/resolver/ResolutionContext.java
+++ b/compiler/java/com/google/dart/compiler/resolver/ResolutionContext.java
@@ -86,7 +86,8 @@ public class ResolutionContext implements ResolutionErrorListener {
if (!Elements.isConstructorParameter(element)
&& !Elements.isParameterOfMethodWithoutBody(element)
&& !(Elements.isStaticContext(element) && !Elements.isStaticContext(existingElement))
- && !existingElement.getModifiers().isAbstractField()) {
+ && !existingElement.getModifiers().isAbstractField()
+ && !Elements.isArtificialAssertMethod(existingElement)) {
SourceInfo nameSourceInfo = element.getNameLocation();
String existingLocation = Elements.getRelativeElementLocation(element, existingElement);
// TODO(scheglov) remove condition once HTML will be fixed to don't have duplicates.

Powered by Google App Engine
This is Rietveld 408576698